Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-merge2.out
author mpm@selenic.com
Tue, 16 Aug 2005 14:53:47 -0800
changeset 917 7f3f55903496
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Fix hg clone race with writer Most read operations in hg don't need locks because we order reads and writes for consistency. Clone is an exception to this as we're copying entire file histories and could end up with more file history copied than we have commits. For now, make clone take a lock on the source repo. Non-hardlinked clone should eventually be changed to use lockless pull.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     3
 
+ hg commit -m commit #0 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     5
 
+ hg commit -m commit #1 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     8
 
+ hg commit -m commit #2 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     9
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    10
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    11
 
+ hg commit -m commit #0 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    12
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    13
 
+ hg commit -m commit #1 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    14
 
+ hg update 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    15
 
+ hg commit -A -m commit #2 -d 0 0
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
    16
 
adding b
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    17
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    18
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    19
 
+ hg commit -m commit #0 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    20
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    21
 
+ hg commit -m commit #1 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    22
 
+ hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    23
 
+ hg update 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    24
 
+ hg commit -A -m commit #2 -d 0 0
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
    25
 
adding b
mercurial-crew-with-dirclash