bzr merge: no message about conflicts in tags

Bug #490891 reported by Alexander Belchenko
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned
Breezy
Triaged
Medium
Unassigned

Bug Description

See steps below:

C:\Temp\7>bzr init a
Created a standalone tree (format: pack-0.92)

C:\Temp\7\a>bzr ci -m1 --unch
Committing to: C:/Temp/7/a/
Committed revision 1.

C:\Temp\7>bzr get a b
Branched 1 revision(s).

C:\Temp\7\b>bzr ci -m2 --unch
Committing to: C:/Temp/7/b/
Committed revision 2.

C:\Temp\7\b>bzr tag foo
Created tag foo.

C:\Temp\7\a>bzr tag foo
Created tag foo.

C:\Temp\7\a>bzr merge ../b
All changes applied successfully.

C:\Temp\7\a>bzr st
pending merge tips: (use -v to see all merge revisions)
  Alexander Belchenko 2009-12-01 2

C:\Temp\7\a>bzr tags
foo 1

But I do have conflicts message on pull/push:

C:\Temp\7\a>bzr revert

C:\Temp\7\a>bzr pull ../b
All changes applied successfully.
Now on revision 2.
Conflicting tags:
    foo

Tags: tags
description: updated
Martin Pool (mbp)
Changed in bzr:
status: New → Confirmed
importance: Undecided → Medium
tags: added: tags
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
Changed in brz:
status: New → Triaged
importance: Undecided → Medium
tags: removed: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.