0.0.6 merge borked ?
Martin
martin at wrasse.stupids.org
Thu Aug 25 10:04:56 BST 2005
On 2005-08-20, Robert Collins <robertc at robertcollins.net> wrote:
> Hi, I have two branches involved in this:
> mine @ http://www.robertcollins.net/twisted_sprint/fingerd (rev 13 at
> time of writing)
> radix's @ http://twistedmatrix.com/users/radix/fingerd (revision 13 at
> the time of writing)
>
> Merging from radix into mine reverts out at least one commit from me -
> which it should not do
I get what appears to be the same problem with merging. Merging from a remote
repository reverts committed changes in my local branch.
This is with 0.0.6 (which is the first version I have ever used)
Any suggestions?
--
Martin Garton.
More information about the bazaar
mailing list