Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch @ 3702:70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
With this patch, instead of generating N renames, we'll generate
1 rename and N-1 copies.
Ideally the rename should come after the copies instead of before
them, but that'd be harder to do.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 20 Nov 2006 19:32:46 -0200 |
| parents | 8dc14d630b29 |
| children | aeafd80c1e78 |
line wrap: on
line source
#!/bin/sh hg init t cd t hg branches echo foo > a hg add a hg ci -m "initial" -d "0 0" hg branch foo hg branch hg ci -m "add branch name" -d "0 0" hg branch bar hg ci -m "change branch name" -d "0 0" hg branch "" hg ci -m "clear branch name" -d "0 0" hg co foo hg branch echo bleah > a hg ci -m "modify a branch" -d "0 0" hg merge hg branch HG_MERGE=true hg ci -m "merge" -d "0 0" hg log hg branches hg branches -q echo % test for invalid branch cache hg rollback hg tip