| 2006-04-20 20:32:37 |
David Allouche |
bug |
|
|
added bug |
| 2006-04-20 20:33:18 |
David Allouche |
bzr: status |
Unconfirmed |
Confirmed |
|
| 2006-04-20 20:33:18 |
David Allouche |
bzr: assignee |
|
aaron-bentley |
|
| 2006-04-20 20:33:18 |
David Allouche |
bzr: severity |
Normal |
Wishlist |
|
| 2006-04-20 20:33:18 |
David Allouche |
bzr: statusexplanation |
|
|
|
| 2006-04-20 20:33:53 |
David Allouche |
title |
show-base for weave merge |
show-base for weave merge (nag abentley) |
|
| 2006-04-20 20:35:50 |
David Allouche |
title |
show-base for weave merge (nag abentley) |
show-base for weave merge - nag abentley |
|
| 2006-04-20 20:36:23 |
David Allouche |
title |
show-base for weave merge - nag abentley |
show-base for weave merge - abentley nag |
|
| 2006-04-20 20:37:23 |
David Allouche |
title |
show-base for weave merge - abentley nag |
show-base for weave merge |
|
| 2008-02-29 21:02:21 |
Aaron Bentley |
bzr: status |
Confirmed |
Won't Fix |
|
| 2008-12-11 01:06:15 |
Martin Pool |
bzr: status |
Won't Fix |
Confirmed |
|
| 2008-12-11 01:06:15 |
Martin Pool |
bzr: assignee |
abentley |
|
|
| 2008-12-11 01:06:15 |
Martin Pool |
bzr: importance |
Wishlist |
High |
|
| 2008-12-11 01:06:15 |
Martin Pool |
bzr: statusexplanation |
Weave merge is in maintenance-only mode, in favour of LCA merge. |
So let's look into this again for Guilhem. |
|
| 2009-12-03 22:58:10 |
John A Meinel |
bzr: assignee |
|
John A Meinel (jameinel) |
|
| 2009-12-03 23:05:18 |
John A Meinel |
attachment added |
|
plan_to_base.py http://launchpadlibrarian.net/36416134/plan_to_base.py |
|
| 2009-12-04 15:19:45 |
John A Meinel |
branch linked |
|
lp:~jameinel/bzr/2.0-40412-show-base-weave |
|
| 2009-12-08 01:27:10 |
Martin Pool |
bzr: status |
Confirmed |
In Progress |
|
| 2009-12-08 21:13:07 |
John A Meinel |
summary |
show-base for weave merge |
create .BASE files for --weave (and --lca) merge |
|
| 2009-12-08 21:13:09 |
John A Meinel |
bzr: status |
In Progress |
Fix Committed |
|
| 2009-12-08 21:14:33 |
John A Meinel |
description |
abentley: ddaa: Remind me to look at implementing show-base for weave merge, sometime. Bram points out that it's possible to synthesize a base, but I'm not sure whether such a base is useful. |
i t is possible to sythesize a BASE for --weave merge, lets do so, so that the output can be used with 3-way tools without having to have users run 'remerge --merge3' after doing a 'merge --weave'. |
|
| 2009-12-10 21:50:33 |
Launchpad Janitor |
branch linked |
|
lp:~jameinel/bzr/2.1-40412-show-base-weave |
|
| 2009-12-10 22:06:30 |
GuilhemBichot |
attachment added |
|
script to repeat a simple merge bug in kdiff3 (wrong automerge) http://launchpadlibrarian.net/36670982/kdiff3_bug.txt |
|
| 2009-12-10 22:11:36 |
John A Meinel |
branch unlinked |
lp:~jameinel/bzr/2.1-40412-show-base-weave |
|
|
| 2009-12-14 20:40:49 |
John A Meinel |
bzr: status |
Fix Committed |
Fix Released |
|
| 2009-12-14 20:40:49 |
John A Meinel |
bzr: milestone |
|
2.1.0b4 |
|
| 2011-06-14 08:15:21 |
Max Bowsher |
removed subscriber Bazaar Developers |
|
|
|
