> > Ok, this version should be ok for merging now... Isn't it?!
> >
> > Sorry, but I'm a git addicted, and bzr is not so friendly as git is to me :P
>
> Coming from the other side of the barricade, I completely understand your
> frustration, but it's still not right, anyhow it has still the same issue,
> once you delete a file from the tree and then re-add it, it's marked in the
> history, and you won't fix it by adding more revisions.
Mh, I thought that using the revert command in the proper way was enough for restoring a removed file (and so I read in the ML)... In fact the diff shown here and in my local tree, against the master branch doesn't report a conflict with the synapse.pot file any more... Why the diff shown here (http://pastebin.ubuntu.com/540314/) doesn't merge with master? :(
I'm hating bazaar :P, however if you can't merge, I'll re-push a newer tree as soon as I can (also if I don't like loosing the commit history! :/)
> > Ok, this version should be ok for merging now... Isn't it?!
> >
> > Sorry, but I'm a git addicted, and bzr is not so friendly as git is to me :P
>
> Coming from the other side of the barricade, I completely understand your
> frustration, but it's still not right, anyhow it has still the same issue,
> once you delete a file from the tree and then re-add it, it's marked in the
> history, and you won't fix it by adding more revisions.
Mh, I thought that using the revert command in the proper way was enough for restoring a removed file (and so I read in the ML)... In fact the diff shown here and in my local tree, against the master branch doesn't report a conflict with the synapse.pot file any more... Why the diff shown here (http:// pastebin. ubuntu. com/540314/) doesn't merge with master? :(
I'm hating bazaar :P, however if you can't merge, I'll re-push a newer tree as soon as I can (also if I don't like loosing the commit history! :/)