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
Wed, 27 Jul 2005 18:16:20 -0800
changeset 785 46a8dd3145cc
parent 767 61ed30e82b27
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Fix undo after aborted commit bug Commit would overwrite undo.dirstate unconditionally, so an undo after an aborted commit would restore the dirstate from the aborted commit and not the prior transaction. This copies dirstate to journal.dirstate and moves it after a successful transaction.
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
 
+ mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     2
 
+ cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     3
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     4
 
+ echo This is file a1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     5
 
+ hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
     6
 
+ hg commit -m 'commit #0' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     7
 
+ echo This is file b1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     8
 
+ hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
     9
 
+ hg commit -m 'commit #1' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    10
 
+ rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    11
 
+ hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    12
 
+ echo This is file b2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    13
 
+ hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    14
 
+ hg commit -m 'commit #2' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    15
 
+ cd ..
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    16
 
+ /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    17
 
+ mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    18
 
+ cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    19
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    20
 
+ echo This is file a1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    21
 
+ hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    22
 
+ hg commit -m 'commit #0' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    23
 
+ echo This is file b1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    24
 
+ hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    25
 
+ hg commit -m 'commit #1' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    26
 
+ rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    27
 
+ hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    28
 
+ echo This is file b2
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    29
 
+ 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 
    30
 
adding b
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    31
 
+ cd ..
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    32
 
+ /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    33
 
+ mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    34
 
+ cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    35
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    36
 
+ echo This is file a1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    37
 
+ hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    38
 
+ hg commit -m 'commit #0' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    39
 
+ echo This is file b1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    40
 
+ hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    41
 
+ hg commit -m 'commit #1' -d '0 0'
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    42
 
+ rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    43
 
+ hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    44
 
+ hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    45
 
+ echo This is file b2
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 409
diff changeset 
    46
 
+ 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 
    47
 
adding b
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    48
 
+ cd ..
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    49
 
+ /bin/rm -rf t
mercurial-crew-with-dirclash