Mercurial > hg
view tests/test-conflict @ 5250:585471802a01
convert: svn: check for branch movement in any log entry, not just the first.
This fixes, for example,
r4151
D /branches
A /project/branches (from /branches:4150)
A /project/tags (from /tags:4150)
A /project/trunk (from /trunk:4150)
D /tags
D /trunk
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 27 Aug 2007 11:56:53 -0700 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id cat a hg status