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-merge8.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 04 Apr 2007 04:22:05 -0300
changeset 4303 6cecaec07cc9
parent 3674 9103dab96093
child 4311 4787e2b0dd03
permissions -rw-r--r--
Revert changeset ef1f1a4b2efb; add another test for glob: patterns With that changeset, it's impossible to use a glob: pattern to match e.g. all files ending in .py - glob:**.py would also match all files in a directory called dir.py.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3389
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     1
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     2
 
pulling from ../a
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     3
 
searching for changes
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     4
 
adding changesets
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     5
 
adding manifests
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     6
 
adding file changes
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     7
 
added 2 changesets with 2 changes to 1 files
efbe24c7d8d9 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     8
 
(run 'hg update' to get a working copy)
3674
9103dab96093 avoid unnecessary copy merges
Matt Mackall <mpm@selenic.com>
parents: 3389
diff changeset 
     9
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
mercurial-crew-with-dirclash