[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: hg merge abort: could not symlink to '/file/blo': File exists:
From:       Snidely <snidely.too () gmail ! com>
Date:       2011-06-18 15:14:55
Message-ID: 05380efd-8838-480d-a970-fde29d89f7be () g16g2000yqg ! googlegroups ! com
[Download RAW message or body]



On May 24, 2:47 pm, philipp <kno...@gmail.com> wrote:
> Hi
>
> now this is change is in a changeset 100+ revisions back and i need to apply
> all those changes afterwards. is there a way to remove this one changset?
> backout doesnt seem to help, as it still want to apply this wrong changeset
> and then the backedout one. but i need a way so it doesnt apply this broken
> changeset.
>
> Thank you for your time
>
> Philipp

I guess I am unsure what the original poster was trying to do.  Not
enough of the scenario is described, I think.  And the OP left off the
version of mecurial involved.

But is it possible to do the merge by specifying a revision on either
side (in the log graph) of the troublesome revision?  Or is there a
naming conflict between files in different branches that somehow isn't
handled by the usual logic?

/dps
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial

[prev in list] [next in list] [prev in thread] [next in thread]