Mercurial > public > mercurial-scm > hg-stable
diff tests/test-convert-cvs-detectmerge.t @ 18376:13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
The output of some tests are changed. Not necessarily to the better, just other
valid permutations.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 13 Dec 2012 23:15:51 +0100 |
| parents | 7698c275aa56 |
| children | aa9385f983fa |
line wrap: on
line diff
--- a/tests/test-convert-cvs-detectmerge.t Tue Jan 15 02:59:14 2013 +0100 +++ b/tests/test-convert-cvs-detectmerge.t Thu Dec 13 23:15:51 2012 +0100 @@ -183,8 +183,8 @@ sorting... converting... 9 add file1 on trunk - 8 add text - 7 unrelated change + 8 unrelated change + 7 add text 6 add text [MERGE from v1_0] 5 add text [MERGE from v1_1] 4 add file2 on trunk @@ -204,8 +204,8 @@ 5: '' add file2 on trunk 4: '' add text [MERGE from v1_1] 3: 'v1_1' add text [MERGE from v1_0] - 2: 'v1_1' unrelated change - 1: 'v1_0' add text + 2: 'v1_0' add text + 1: 'v1_1' unrelated change 0: '' add file1 on trunk graphical log @@ -225,9 +225,9 @@ |\| | o 3: 'v1_1' add text [MERGE from v1_0] | |\ - +---o 2: 'v1_1' unrelated change + +---o 2: 'v1_0' add text | | - | o 1: 'v1_0' add text + | o 1: 'v1_1' unrelated change |/ o 0: '' add file1 on trunk