Mercurial Mercurial > hg / 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>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5374 e710874247d1
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
permissions -rw-r--r--
convert: allow the converter_source to say "skip this revision" If getchanges returns a string, it's assumed to be the id of an already converted revision. We map the current revision to the same revision this converted revision was mapped to. To allow skipping a root revision, getchanges can return the special string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which hopefully won't clash with any real id. The converter_source is responsible for rewriting the parents of the commit objects to make sure the revision graph makes sense.
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)
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
     9
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Mercurial