| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
| Thu, 12 Aug 2010 19:49:58 +0900 | |
| changeset 11796 | 141e2e964705 |
| parent 11417 | 6f1d1ed3e19a |
| permissions | -rw-r--r-- |
|
4748
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
adding a |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
marked working directory as branch b |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
adding b |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 |
fast-forward |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
(branch merge, don't forget to commit) |
|
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
bogus fast-forward should fail |
|
11417
6f1d1ed3e19a
merge: improve merge with ancestor message
Matt Mackall <mpm@selenic.com>
parents:
11181
diff
changeset
|
9 |
abort: merging with a working directory ancestor has no effect |
|
4748
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
done |