Mercurial Mercurial > mercurial / 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-merge1.out
author mpm@selenic.com
Sat, 30 Jul 2005 08:35:29 -0800
changeset 808 8f5637f0a0c0
parent 749 7e4843b7efd2
parent 801 1f9ec150a476
child 814 0902ffece4b4
permissions -rw-r--r--
Merge with TAH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     3
 
+ hg commit -m commit #0 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     5
 
+ hg commit -m commit #1 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg update 0
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg add c
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     8
 
+ hg commit -m commit #2 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     9
 
+ hg update -m 1
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    10
 
+ hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    11
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    12
 
+ hg commit -m commit #0 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    13
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    14
 
+ hg commit -m commit #1 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    15
 
+ hg update 0
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    16
 
+ hg add c
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    17
 
+ hg commit -m commit #2 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    18
 
+ hg update -m 1
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    19
 
merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    20
 
merging b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    21
 
+ hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    22
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    23
 
+ hg commit -m commit #0 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    24
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    25
 
+ hg commit -m commit #1 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    26
 
+ hg commit -m commit #2 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    27
 
+ hg update 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    28
 
+ hg add c
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    29
 
+ hg commit -m commit #3 -d 0 0
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
    30
 
This is file b1
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    31
 
+ hg update -m 2
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
    32
 
merging for b
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
    33
 
merging b
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    34
 
+ hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    35
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    36
 
+ hg commit -m commit #0 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    37
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    38
 
+ hg commit -m commit #1 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    39
 
+ hg commit -m commit #2 -d 0 0
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    40
 
+ hg update 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    41
 
+ hg add c
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    42
 
+ hg commit -m commit #3 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
    43
 
+ hg update -m 2
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    44
 
merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    45
 
merging b
mercurial