merge between two branches fails
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Undecided
|
Unassigned | ||
Breezy |
Triaged
|
Low
|
Unassigned |
Bug Description
I tried to merge two branches that I thought were the same, and turns out they aren't the same at all. Attaching version-info for both branches, and the output of bzr merge.
steven@
revision-id: <email address hidden>
date: 2008-04-19 03:00:27 +1000
build-date: 2008-06-30 13:32:23 +1000
revno: 10
branch-nick: ubuntu
steven@
revision-id: <email address hidden>
date: 2008-04-10 14:45:39 +0000
build-date: 2008-06-30 13:32:32 +1000
revno: 61
branch-nick: trunk
steven@
+N ChangeLog.OTHER
+N libmokoui/
+N libmokoui/
R libmokoui/ => libmokoui.moved/
Contents conflict in ChangeLog
Conflict adding files to libmokoui. Created directory.
Conflict because libmokoui is not versioned, but has versioned children. Versioned directory.
Conflict adding file libmokoui. Moved existing file to libmokoui.moved.
Contents conflict in libmokoui/
5 conflicts encountered.
zsh: exit 1 bzr merge -r 60..61 ../trunk
Changed in bzr: | |
status: | Incomplete → Confirmed |
tags: | added: check-for-breezy |
tags: |
added: merge removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Low |
What did you expect would happen?
If the branches are public could you please attach their url?