QBzr

How do I resolve a conflict with qconflicts and meld?

Asked by Artis Rozentāls

I've been experimenting with conflict resolution using qconflicts and meld. I'd introduce a merge conflict, and as qconflicts to run meld, resolve the conflict in the THIS file and mark the conflict as resolved.

I expected THIS to be promoted to the working tree upon resolution, instead BASE, OTHER and THIS are removed and the file is left with the text conflict marker.

What am I missing?

Question information

Language:
English Edit question
Status:
Answered
For:
QBzr Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Alexander Belchenko (bialix) said : 		#1

How can you configure the meld invocation? I think you should set it to save result of merge to original file, not to THIS file.

Revision history for this message
Launchpad Janitor (janitor) said : 		#2

This question was expired because it remained in the 'Needs information' state without activity for the last 15 days.

Revision history for this message
Artis Rozentāls (artis) said : 		#3

As far as I can tell meld doesn't have any invocation options that do that.

Revision history for this message
Alexander Belchenko (bialix) said : 		#4

OK, looking in the code of extmerge plugin (you may want to install it to get better interaction with meld) you need to configure meld tool via qconfig as:

meld %b %T %o

Thus before meld invocation will be created a temporary copy of THIS file which you need to edit in order to resolve conflicts and save when you make it. If merge was successfull (meld exits with exit code 0) then this temporary file will replace original file with conflicts.

Revision history for this message
Artis Rozentāls (artis) said : 		#5

I put that into qconfig, now when I check the "Use Configured Default" the grayed out "Merge tool" textbox reads: "Missing the flag: %r. Configure in qconfig under the merge tab."

Revision history for this message
Alexander Belchenko (bialix) said : 		#6

Please file a bug report. This is definitely a bug.

Revision history for this message
Artis Rozentāls (artis) said : 		#7

Wonder what or were to fill, however... lib/conflicts.py doesn't even have a %T flag.

Revision history for this message
Alexander Belchenko (bialix) said : 		#8

Artis Rozentāls пишет:
> Artis Rozentāls is still having a problem:
> Wonder what or were to fill, however... lib/conflicts.py doesn't even
> have a %T flag.

Gary, can you add some comments on this?

Can you help with this problem?

Provide an answer of your own, or ask Artis Rozentāls for more information if necessary.

To post a message you must log in.