Mercurial > hg
view tests/test-conflict @ 11818:b1ae33b813cb stable
hg.clone: do not ignore branch argument when source is a repo object
This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear:
hopefully using a test to cover this usage should prevent any bugs.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Fri, 02 Jul 2010 15:12:50 +0900 |
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