monotone - Bugs: bug #17878, Usability: too easy to...
You are not allowed to post comments on this tracker with your current authentication level.
bug #17878: Usability: too easy to accidentally fork after merge or disapprove
Submitter: | Ludovic Brenta <lbrenta> | ||
Submitted: | Thu 28 Sep 2006 03:26:55 PM UTC | ||
Category: | command line UI | Severity: | 3 - Normal |
Item Group: | feature request | Status: | Fixed |
Privacy: | Public | Assigned to: | tbrownaw |
Open/Closed: | Closed | ||
mtn version --full: | monotone 0.30 (base revision: 8729c7d9cbb4f638fd97a9951705a196468b11fe) |
Jump to the original submission
Sun 16 May 2010 05:58:50 PM UTC, comment #11: |
Timothy Brownawell <tbrownaw>![]() ![]() |
Sun 16 May 2010 05:56:50 PM UTC, comment #10: What does the fix branch do? Several proposals appeared in this bug report and I'm not sure which one was finally implemented. |
Ludovic Brenta <lbrenta>![]() |
Sun 16 May 2010 05:46:18 PM UTC, comment #9: The fix branch for this is merged now. |
Timothy Brownawell <tbrownaw>![]() ![]() |
Sun 09 May 2010 04:32:03 PM UTC, comment #8: For the record - we already have a global --no-workspace option already - no need for another --update-workspace one... and remember that you can also configure default command options in monotone, so "your" disapprove could internally always be called with --no-workspace and behave just like before.
|
Thomas Keller <tommyd>![]() |
Sun 09 May 2010 02:24:58 PM UTC, comment #7: please don't make 'disapprove', or any other db command, affect the current workspace.
|
Stephen Leake <stephen_leake>![]() |
Sun 09 May 2010 09:54:59 AM UTC, comment #6: That seems reasonable.
|
Ludovic Brenta <lbrenta>![]() |
Sun 09 May 2010 12:31:36 AM UTC, comment #5: Oh, hm, it doesn't.
|
Timothy Brownawell <tbrownaw>![]() ![]() |
Sat 08 May 2010 11:40:04 PM UTC, comment #4: In the scenario I described, "disapprove" cannot warn when it creates divergence because it does not create divergence. Indeed, it is "commit" that later creates the divergence.
|
Ludovic Brenta <lbrenta>![]() |
Sat 08 May 2010 10:29:45 PM UTC, comment #3: +1 for that, but I'd personally wait with the second point until Derek landed the changelog editor branch in mainline (or if you want to go for it, base your work on his branch). |
Thomas Keller <tommyd>![]() |
Sat 08 May 2010 10:19:52 PM UTC, comment #2: I think what we want to do here is:
|
Timothy Brownawell <tbrownaw>![]() ![]() |
Spam posted by anonymous | |
Thu 28 Sep 2006 03:26:55 PM UTC, original submission:
It is too easy to overlook the warning Monotone gives after a merge:
|
Ludovic Brenta <lbrenta>![]() |
No files currently attached
Depends on the following items: None found
Items that depend on this one: None found
There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.
- Many commands that change the heads of a branch (approve, disapprove,
pull, merge, etc) can now take an option "--update". If run from
a workspace which is based on a head of the branch and has no local
changes, this option makes these commands update that workspace to
the new head. If you always want this behavior, you can define the
get_default_command_options(cmd)
hook in your monotonerc.