Mercurial > hg
view tests/bundles/rename.sh @ 27746:f0e9f38d250f
rebase: prevent creating divergence
Before this patch rebase would create divergence when you were rebasing obsolete
changesets on a destination not containing one of its successors.
This patch introduces rebase.allowdivergence to explicitly allow
divergence creation with rebase.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 12 Jan 2016 13:43:41 -0800 |
parents | ebf6d38c9063 |
children |
line wrap: on
line source
#!/bin/sh # @ 3: 'move2' # | # o 2: 'move1' # | # | o 1: 'change' # |/ # o 0: 'add' hg init copies cd copies echo a > a echo b > b echo c > c hg ci -Am add echo a >> a echo b >> b echo c >> c hg ci -m change hg up -qC 0 hg cp a d hg mv b e hg mv c f hg ci -m move1 hg mv e g hg mv f c hg ci -m move2 hg bundle -a ../renames.hg cd ..