Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-revert2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 21 Dec 2007 21:50:19 +0100
changeset 5685 57d29a45ffbc
parent 4387 93a4e72b4f83
child 5863 3d1f9dcecdea
permissions -rw-r--r--
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
     1
 
1:f248da0d4c3e
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
     2
 
0:9eca13a34789
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
     3
 
f248da0d4c3e tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2029
diff changeset 
     4
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
     5
 
9eca13a34789
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
     6
 
9eca13a34789+
2029
d436b21b20dc rewrite revert command. fix issues 93, 123, 147.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
     7
 
reverting file1
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
     8
 
9eca13a34789
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2029
diff changeset 
     9
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
    10
 
f248da0d4c3e tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2029
diff changeset 
    11
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3869
diff changeset 
    12
 
warning: conflicts during merge.
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    13
 
merging file1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    14
 
merging file1 failed!
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2029
diff changeset 
    15
 
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2029
diff changeset 
    16
 
There are unresolved merges with locally modified files.
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2175
diff changeset 
    17
 
You can redo the full merge using:
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2175
diff changeset 
    18
 
  hg update 0
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2175
diff changeset 
    19
 
  hg update 1
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
    20
 
diff -r f248da0d4c3e file1
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    21
 
--- a/file1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    22
 
+++ b/file1
1637
3b1b44b917f4 Add new bdiff based unidiff generation.
mason@suse.com
parents: 925
diff changeset 
    23
 
@@ -1,3 +1,7 @@ added file1
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    24
 
 added file1
864
6225bd773c51 Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 862
diff changeset 
    25
 
 another line of text
4387
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4365
diff changeset 
    26
 
+<<<<<<< my
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    27
 
+changed file1 different
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    28
 
+=======
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    29
 
 changed file1
4387
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4365
diff changeset 
    30
 
+>>>>>>> other
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
    31
 
M file1
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
    32
 
f248da0d4c3e+ tip
2029
d436b21b20dc rewrite revert command. fix issues 93, 123, 147.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
    33
 
reverting file1
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
    34
 
f248da0d4c3e tip
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
    35
 
f248da0d4c3e tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2029
diff changeset 
    36
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1637
diff changeset 
    37
 
f248da0d4c3e tip
Mercurial