atom feed50 messages in com.selenic.mercurialQuestions about Bookmarks
FromSent OnAttachments
Stephen LeeMar 9, 2013 7:24 pm 
Kevin BullockMar 11, 2013 7:44 am 
Stephen LeeMar 11, 2013 4:45 pm 
Kevin BullockMar 11, 2013 6:35 pm 
Stephen LeeMar 11, 2013 9:36 pm 
Eric SiegermanMar 11, 2013 10:24 pm 
Kastner Masilko, FriedrichMar 12, 2013 1:17 am 
Eric SiegermanMar 12, 2013 6:51 am 
Kevin BullockMar 12, 2013 9:40 am 
Kevin BullockMar 12, 2013 10:02 am 
Angel EzquerraMar 12, 2013 3:01 pm 
Kastner Masilko, FriedrichMar 13, 2013 1:54 am 
Stephen LeeMar 13, 2013 4:35 am 
Kastner Masilko, FriedrichMar 13, 2013 5:36 am 
Stephen LeeMar 13, 2013 6:16 am 
Eric SiegermanMar 13, 2013 6:24 am 
Stephen LeeMar 13, 2013 7:00 am 
Eric SiegermanMar 13, 2013 7:17 am 
Kastner Masilko, FriedrichMar 13, 2013 7:32 am 
Martin GeislerMar 13, 2013 10:33 am 
Becker, Mischa JMar 13, 2013 11:11 am 
Stephen LeeMar 13, 2013 5:04 pm 
Kastner Masilko, FriedrichMar 14, 2013 12:51 am 
Augie FacklerMar 14, 2013 10:01 am 
Kevin BullockMar 14, 2013 11:40 am 
Augie FacklerMar 14, 2013 11:41 am 
Stephen LeeMar 14, 2013 4:51 pm 
eodeJul 12, 2013 6:36 pm 
Matt MackallJul 15, 2013 11:50 pm 
Stephen LeeJul 21, 2013 5:55 pm 
Kastner Masilko, FriedrichJul 22, 2013 1:21 am 
Bosco RamaJul 22, 2013 9:03 am 
Stephen LeeJul 22, 2013 5:41 pm 
Brian ViselJul 22, 2013 10:04 pm 
Kastner Masilko, FriedrichJul 23, 2013 12:00 am 
Kastner Masilko, FriedrichJul 23, 2013 1:22 am 
Kevin BullockJul 23, 2013 7:44 am 
Kastner Masilko, FriedrichJul 23, 2013 10:28 am 
Brian ViselJul 23, 2013 2:10 pm 
Stephen LeeJul 23, 2013 6:55 pm 
Kastner Masilko, FriedrichJul 23, 2013 10:56 pm 
Andreas TscharnerJul 23, 2013 11:36 pm 
Stephen LeeJul 23, 2013 11:43 pm 
Kastner Masilko, FriedrichJul 23, 2013 11:46 pm 
Stephen LeeJul 24, 2013 12:10 am 
Kastner Masilko, FriedrichJul 24, 2013 12:31 am 
eodeJul 24, 2013 11:54 am 
Brian ViselJul 24, 2013 12:32 pm 
Brian ViselJul 24, 2013 12:41 pm 
Stanimir StamenkovJul 28, 2013 2:29 am 
Subject:Questions about Bookmarks
From:Stephen Lee (sphe@gmail.com)
Date:Mar 9, 2013 7:24:19 pm
List:com.selenic.mercurial

I'm in the process of introducing Mercurial (2.5.1) into my workplace and I have 2 questions about bookmarks:

1) I have a repo with multiple bookmarked heads, as well as one bookmark pointing to the reviewed baseline. I want to merge a bookmarked head into the baseline. In the case where the baseline is not an ancestor of the bookmarked head, "hg update baseline; hg merge <bookmark>" works just fine.

However when the baseline is an ancestor, merge says 'nothing to merge' and suggests update. Running a bare update will 'merge' with the tip of the branch which may not be the bookmark I want, but "hg update <bookmark>" will leave the baseline bookmark where it is and instead activate the bookmark to be merged.

The only way I can do this is "hg update <bookmark>; hg bookmark -f baseline" Is there any plan to smooth this out? Perhaps allow merge to actually perform an update if the target is bookmarked?

2) When push would create a new head, but there is a remote bookmark that will advance to this head, the push does not need -f to proceed. However, if the new head is about to be bookmarked (via "push -B") then the push aborts and requires -f. Is this intentional? For new branches there is the "--new-branch" option, for bookmarks I think "-B" implies that a new head should be allowed.

I am willing to send patches if necessary. (I'm the author of the lighttags extension, and I have done some hacking on the codebase in the past.)