Mercurial > hg-stable

view tests/test-rename-dir-merge2.out @ 7381:b965605dfb2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: be even more tolerant when detecting svn tags Former code failed when tracking child directories we assumed were renamed with their parents but were really created in the tags directory. This happens in jQuery repository with /tags/ui/1.5b4/release@5455.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 15 Nov 2008 15:51:26 +0100
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

adding a/f
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving a/f to b/f
adding a/aa/g
pulling from ../r2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
A b/aa/g
  a/aa/g
R a/aa/g
R a/f