[Laszlo-checkins] r6472 - openlaszlo/branches/legals

[Benjamin Shine]

I've been using the -b flag, but it doesn't appear to work as  
advertised. For instance, r6206 in wafflecone was a block of a  
revision from legals:
------------------------------------------------------------------------
r6206 | ben | 2007-08-23 21:42:24 -0700 (Thu, 23 Aug 2007) | 45 lines

Blocked revisions 6178 via svnmerge
[snip]


but in legals, r6206 is shown as available for merging:
$ svnmerge avail -b -r6200:6210 -S wafflecone
6200-6201,6203,6206,6208


So then I explicitly block some revisions:
$ svnmerge block -r6206,6214,6215,6266,6432 -S wafflecone

and repeat the "avail" command, and 6206 is no longer there:
$  svnmerge avail -b -r6200:6210 -S wafflecone
6200-6201,6203,6208

And then I still get a ton of rehashed log messages in the auto- 
generated svnmerge-commit-message.txt, which I have just begun hand- 
removing because commit-log bloat is bad.

Do you see another way to do this?

On Sep 13, 2007, at 4:29 PM, Max Carlson wrote:

> You don't need to do this...  'svnmerge can skip these
> so-called "reflected" revisions if you specify the --bidirectional  
> or -b
> command line option.'
>
> $ svnmerge.py help merge
> usage: svnmerge merge [OPTION...] [PATH]
>
> Merge in revisions into PATH from its source. If --revision is  
> omitted, all
> the available revisions will be merged. In any case, already merged-in
> revisions will NOT be merged again.
>
> When svnmerge is used to bidirectionally merge changes between a  
> branch and
> its source, it is necessary to not merge the same changes forth and  
> back:
> e.g., if you committed a merge of a certain revision of the branch  
> into the
> source, you do not want that commit to appear as available to merged
> into the
> branch (as the code originated in the branch itself!). svnmerge can  
> skip
> these
> so-called "reflected" revisions if you specify the --bidirectional  
> or -b
> command line option.
>
> When manually merging changes across branches, --record-only can be  
> used to
> instruct svnmerge that a manual merge of a certain revision already
> happened,
> so that it can record it and not offer that revision for merge  
> anymore.
> Conversely, when there are revisions which should not be merged, use
> 'svnmerge
> block'.
>
> Command options:
>    -b [--bidirectional]          : remove reflected revisions from  
> merge
>                                    candidates
>    -f [--commit-file] FILE       : set the name of the file where the
> suggested
>                                    log message is written to (default:
>                                    svnmerge-commit-message.txt)
>    -r [--revision] REVLIST       : specify a revision list,  
> consisting of
>                                    revision numbers and ranges  
> separated by
>                                    commas, e.g., "534,537-539,540"
>    -S [--source] [--head] SOURCE : specify a merge source for this
> branch. It
>                                    can be either a path, a full  
> URL, or an
>                                    unambiguous substring of one of  
> the paths
>                                    for which merge tracking was  
> already
>                                    initialized. Needed only to
> disambiguate in
>                                    case of multiple merge sources
>    -M [--record-only]            : do not perform an actual merge  
> of the
>                                    changes, yet record that a merge  
> happened
>
> Global options:
>    -F [--force]             : force operation even if the working copy
> is not
>                               clean, or there are pending updates
>    -n [--dry-run]           : don't actually change anything, just  
> pretend;
>                               implies --show-changes
>    -s [--show-changes]      : show subversion commands that make  
> changes
>    -v [--verbose]           : verbose mode: output more information  
> about
>                               progress
>    -u [--username] USERNAME : invoke subversion commands with the  
> supplied
>                               username
>    -p [--password] PASSWORD : invoke subversion commands with the  
> supplied
>                               password
>    -h [--help]              : show help for this command and exit
>    -V [--version]           : show version info and exit
>
> ben at openlaszlo.org wrote:
>> Author: ben
>> Date: 2007-09-13 16:15:46 -0700 (Thu, 13 Sep 2007)
>> New Revision: 6472
>>
>> Modified:
>>    openlaszlo/branches/legals/
>> Log:
>> Blocked revisions 6069 via svnmerge
>>
>> *** This message was hand-edited by bshine to take out commit  
>> messages about
>>   revisions to legals that are being blocked from being re-merged  
>> to legals.
>>   these comments just add bloat to the commit log for these files.
>>   [bshine 2007.09.13]
>>
>> ...............
>>   r6069 | ben | 2007-08-15 14:31:08 -0700 (Wed, 15 Aug 2007) | 193  
>> lines
>>
>>   Blocked revisions 5820,5861,5891,6066-6067 via svnmerge
>>
>> ...............
>>
>>
>>
>> Property changes on: openlaszlo/branches/legals
>> ___________________________________________________________________
>> Name: svnmerge-blocked
>>    - /openlaszlo/branches/wafflecone:5808,5811,5813 /openlaszlo/ 
>> trunk:3893,3953,4394,4462,4468,4472,5086,5172,5204,5210,5332
>>    + /openlaszlo/branches/wafflecone:5808,5811,5813,6069 / 
>> openlaszlo/trunk: 
>> 3893,3953,4394,4462,4468,4472,5086,5172,5204,5210,5332
>>
>>
>> _______________________________________________
>> Laszlo-checkins mailing list
>> Laszlo-checkins at openlaszlo.org
>> http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
>
> -- 
> Regards,
> Max Carlson
> OpenLaszlo.org
>
> _______________________________________________
> Laszlo-checkins mailing list
> Laszlo-checkins at openlaszlo.org
> http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins