Help in transfering merged changesets

[Akhil Gaur]

Akhil Gaur


On Thu, Apr 2, 2009 at 6:46 PM, Peter Hosey <boredzo at gmail.com> wrote:

> On Apr 02, 2009, at 05:28:51, Akhil Gaur wrote:
>
>> Main                                  Client
>>                 3                       o
>>                                         |\
>> o                2                       o |
>> |                                        | |
>>  o              1                       | o
>> |/                                       |/
>> o                0                       o
>>
>
> (I include this for the benefit of anyone who couldn't read the graph in
> your email.)
>
>  I have tried to use pull, push, bundle and transplant but I was not
>> successful.
>>
>
>
> What is the output of hg version?
> Mercurial Distributed SCM (version 1.1.1+20081229)




> What is the output of hg pull (in the main)?

   Hg pull is bringing in all the changeset from the Clinet to main.

> >hg pull -f -r 3 ..\client



>
> What is the output of hg push (in the client)?

   Hg push is doing the same thing as pull

> > hg push -f -r 3 ..\main
>
> What is the output of hg unbundle?

   this is how i an creating bundle:
l>hg bundle -f -r 3 --base 3 ..\bundle
1 changesets found
List of changesets:
0176ad8ce9b36cbf3fc4c267e4341fe82089b0ee

THis is how i am unbundling:

>hg unbundle -u ..\bundle
adding changesets
add changeset 0176ad8ce9b3
transaction abort!
rollback completed
abort: 00changelog.i at aa40110b27b9: unknown parent!

Hi Peter,

Thanks for replying.

I have answered your questions in the sequence.

Please let me know if you need any other info.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090403/69290b62/attachment.htm