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-merge1.out
author Volker.Kleinfeld@gmx.de
Tue, 20 Sep 2005 19:25:14 -0700
changeset 1283 f5faab34f32e
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
Support for the distutils extention 'py2exe' added. Description: - If the py2exe distutils extention is installed this patch allows building standalone exe for windows - example: > python setup.py build --compiler=mingw32 py2exe - The 'out of the box' py2exe is not able to resolve the dependencies due to 'demandload'. A new helper module of scanning the mercurial package has been added. Changed: - setup.py: importing py2exe and sub classing its command class to fetch the build directory and insert the needed includes - packagescan.py: new helper module added, that scans the distutil build directory for modules to be included.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     1
 
%% no merges expected
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     2
 
%% merge of b expected
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     3
 
merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     4
 
merging b
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     5
 
%%
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     6
 
Contents of b should be "this is file b1"
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
     7
 
This is file b1
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     8
 
%% merge expected!
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
     9
 
merging for b
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
    10
 
merging b
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
    11
 
%% merge of b expected
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    12
 
merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    13
 
merging b
mercurial-crew-with-dirclash