Activity log for bug #1042102
| Date | Who | What changed | Old value | New value | Message |
|---|---|---|---|---|---|
| 2012-08-27 07:47:06 | ChriS | bug | added bug | ||
| 2012-08-27 19:24:44 | ChriS | tags | github | ||
| 2012-08-28 14:15:20 | Jelmer Vernooij | summary | dpush "overrides" commits | dpush doesn't check for diverged branches | |
| 2012-08-28 14:15:23 | Jelmer Vernooij | bzr-git: status | New | Triaged | |
| 2012-08-28 14:15:28 | Jelmer Vernooij | bzr-git: importance | Undecided | Medium | |
| 2012-08-28 14:16:04 | Jelmer Vernooij | description | The following bug is very problematic for collaboration with git users. Here is a sequence to reproduce it on github. 1. Create a new github repository, say "test". 2. Create a local bzr repository, populate it with one file (say) and commit it and push it to github: bzr dpush git@github.com:$USER/test.git,branch=master 3. “git clone git@github.com:$USER/test.git” 4. Makre a commit using git (say add a file). 5. Push: “git push” 6. Make a new commit in the bzr repository. 6. Push: “bzr dpush” The problems are that: 1. There is no warning that the remote repository contains a new commit. 2. After bzr push, one cannot see the git commit anymore! It is there somewhere (because one can refer to it using its git id) but does not appear in the history. | "bzr dpush" to remote repositories doesn't check whether the ancestries have diverged. It should, consistent with "bzr push". | |
| 2013-09-05 19:17:58 | Ted | bug | added subscriber Ted | ||
| 2018-03-06 01:05:45 | Jelmer Vernooij | bug task added | brz-git | ||
| 2018-03-06 01:23:01 | Jelmer Vernooij | brz-git: status | New | Triaged | |
| 2018-03-06 01:23:04 | Jelmer Vernooij | brz-git: importance | Undecided | Medium | |
| 2018-03-23 01:38:48 | Jelmer Vernooij | brz-git: assignee | Jelmer Vernooij (jelmer) | ||
| 2018-03-23 01:38:51 | Jelmer Vernooij | brz-git: milestone | integration | ||
| 2018-03-31 18:15:59 | Launchpad Janitor | branch linked | lp:~jelmer/brz-git/diverged-branches | ||
| 2018-03-31 19:07:47 | Jelmer Vernooij | brz-git: status | Triaged | Fix Released | |
| 2018-05-10 01:39:32 | Jelmer Vernooij | affects | brz-git | brz | |
| 2018-05-10 01:39:32 | Jelmer Vernooij | brz: milestone | integration | ||
| 2018-05-10 01:44:44 | Jelmer Vernooij | brz: milestone | 3.0.0 | ||
| 2018-05-10 01:44:48 | Jelmer Vernooij | summary | dpush doesn't check for diverged branches | git: dpush doesn't check for diverged branches |
