rebase question WAS "insert old code into repo"

Bill Barry after.fallout at gmail.com
Thu Mar 12 12:21:21 CDT 2009


I think you want transplant, not rebase...


Marko Käning wrote:
> This thread was "insert old code into repo":
>
> Now I have a problem with understanding rebase, I guess...
>
> Look at this:
>
> ---------------------------------------------------
>
> #!/bin/bash
>
> # Generate oldrepo as example for old code
> mkdir oldrepo
> cd oldrepo
> echo "old content" > test.txt
> hg init
> hg add
> hg ci -m "- old content"
>
> cd ..
>
> # Generate repo as example for current code base
> mkdir repo
> cd repo
> echo "new content" > test.txt
> hg init
> hg add
> hg ci -m "- new content"
>
> echo "another change" >> test.txt
> hg ci -m "- another change"
>
> echo "yet another change" >> test.txt
> hg ci -m "- yet another change"
>
> cd ..
>
> # Now force pull all current changesets into oldrepo
> cd oldrepo
>   
hg transplant -s ../repo -a

I think...


More information about the Mercurial mailing list