Mercurial > hg
view tests/test-update-reverse @ 4058:e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 30 Jan 2007 19:09:08 -0200 |
parents | 7544700fd931 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg commit -m "Added a" -d "1000000 0" touch main hg add main hg commit -m "Added main" -d "1000000 0" hg checkout 0 echo Main should be gone ls touch side1 hg add side1 hg commit -m "Added side1" -d "1000000 0" touch side2 hg add side2 hg commit -m "Added side2" -d "1000000 0" hg log echo Should have two heads, side2 and main hg heads echo Should show "a side1 side2" ls hg update --debug -C 1 echo Should only show "a main" ls