[00:01] <mark06> what do you mean?
[00:01] <jelmer> mark06: if you do a merge, then that should show up in "bzr status"
[00:02] <jelmer> if you then resolve some conflicts, you should still see that merge in "bzr status"
[00:02] <mark06> I don't remember bzr status but when I bzr commit, the commit wasn't a merge but plain
[00:02] <jelmer> in that case, are you sure you actually did a merge?
[00:03] <jelmer> mark06: after that command in your paste, does "bzr status" list a merge?
[00:03] <mark06> bzr branch -r 100 foo bar
[00:03] <mark06> then in bar, bzr merge -r100..-1 ../foo
[00:04] <mark06> but this is not my paste, that one is unresolved yet
[00:04] <mark06> for my paste I have this at the end of bzr status:
[00:05] <mark06> pending merge tips: (use -v to see all merge revisions)
[00:05] <mark06>   Renato Silva 2014-09-10 Make the greper alias case sensitive.
[00:05] <jelmer> mark06: that makes it seem like it is a cherry-pick merge
[00:05] <mark06> so -r0..-1 should fix it?
[00:06] <jelmer> mark06: fix what exactly?
[00:08] <mark06> fix the commit
[00:08] <mark06> it should be a merge
[00:09] <mark06> indeed it fixes :)
[00:12] <mark06> cool :) http://i.imgur.com/Ae4a8gK.png
[00:18] <jelmer> mark06: so this won't actually do any textual merges, it just renames the files from one branch. is that really what you want?
[00:19] <jelmer> anyway, bedtime here. g'night!
[00:19] <mark06> hmm no I do want the textual merges :(
[00:19] <mark06> thanks anyway jelmer
[00:21] <mark06> ah I didn't notice the .moved in the bottom right, should be fixed for sure
[00:22] <mark06> it's just that my resolve was like "just resolve it" for testing :)