Mercurial Mercurial > mercurial / 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-rename-dir-merge2.out
author Christian Ebert <blacktrash@gmx.net>
Tue, 16 Mar 2010 22:29:16 +0100
changeset 10714 9c0a1887bd4b
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
keyword: do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
adding a/f
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset 
     2
 
updating to branch default
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset 
     4
 
moving a/f to b/f
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     5
 
adding a/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     6
 
pulling from ../r2
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     7
 
searching for changes
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
adding changesets
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     9
 
adding manifests
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    10
 
adding file changes
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    11
 
added 1 changesets with 1 changes to 1 files (+1 heads)
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    12
 
(run 'hg heads' to see heads, 'hg merge' to merge)
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
    13
 
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    14
 
(branch merge, don't forget to commit)
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    15
 
M b/f
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    16
 
A b/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    17
 
  a/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    18
 
R a/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    19
 
R a/f
mercurial