Breezy

Merge lp:~jelmer/brz/diverged-revids into lp:brz

  1. diverged-revids
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: Vincent Ladeuil
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/diverged-revids
Merge into: lp:brz
Diff against target: 29 lines (+4/-4)
2 files modified
breezy/tests/per_branch/test_pull.py (+2/-2)
breezy/tests/per_interbranch/test_pull.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/diverged-revids
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+340147@code.launchpad.net

Commit message

Use unique messages for commits in diverged branches.

Description of the change

Use unique messages for commits in diverged branches.

If the commits are exactly the same and created right after each other, there are changes they end up with the same commit SHA in Git - which means they're not actually divergend.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/per_branch/test_pull.py'
2--- breezy/tests/per_branch/test_pull.py 2017-08-07 19:15:59 +0000
3+++ breezy/tests/per_branch/test_pull.py 2018-03-01 00:27:56 +0000
4@@ -121,8 +121,8 @@
5 tree_a = self.make_branch_and_tree('tree_a')
6 tree_a.commit('message 1')
7 tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
8- rev2a = tree_a.commit('message 2')
9- rev2b = tree_b.commit('message 2')
10+ rev2a = tree_a.commit('message 2a')
11+ rev2b = tree_b.commit('message 2b')
12 self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
13 self.assertRaises(errors.DivergedBranches,
14 tree_a.branch.pull, tree_b.branch,
15
16=== modified file 'breezy/tests/per_interbranch/test_pull.py'
17--- breezy/tests/per_interbranch/test_pull.py 2017-08-07 19:09:47 +0000
18+++ breezy/tests/per_interbranch/test_pull.py 2018-03-01 00:27:56 +0000
19@@ -103,8 +103,8 @@
20 tree_a = self.make_from_branch_and_tree('tree_a')
21 tree_a.commit('message 1')
22 tree_b = self.sprout_to(tree_a.controldir, 'tree_b').open_workingtree()
23- rev2a = tree_a.commit('message 2')
24- rev2b = tree_b.commit('message 2')
25+ rev2a = tree_a.commit('message 2a')
26+ rev2b = tree_b.commit('message 2b')
27 self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
28 self.assertRaises(errors.DivergedBranches,
29 tree_a.branch.pull, tree_b.branch,

Subscribers

People subscribed via source and target branches