Re: [perl bindings] Bizarre copy of UNKNOWN in subroutine
So does this qualify as a proper bug? Can I add this to the issue tracker?
Re: [perl bindings] Bizarre copy of UNKNOWN in subroutine
On Sun, Jun 19, 2011 at 07:43:31PM +0200, Otto Allmendinger wrote: > So does this qualify as a proper bug? Can I add this to the issue tracker? Yes, please add it. Someone will need to pin down where the problem is coming from. Is it SWIG? Is it Perl? Is it Subversion? Can you try to reproduce the problem with an earlier version of SWIG and/or Perl?
how to get a list of unmerged revisions?
I've got a trunk and a maintenance branch. I periodically merge changes from the maintenance branch to trunk. Merge tracking is a help here. Commits on the maintenance branch begin with an ID identifying the issue, backlog item or user story. When I merge changes to trunk, I'd like to merge those belonging to the same ID together, but I don't want to mix different IDs in the same merge. To do this, I explicitly name the revisions I want to merge on the command line. Now, how do I get Subversion to tell me which revisions of have not been merged to ? What I've been doing is either (1) firing up TortoiseSVN, which shows already merged revisions in grey when you start a log viewer from the merge dialog box or (2) actually doing the merge and then meditating over the diff of the svn:merge-info property before reverting the merge again and doing it properly. Both of these approaches are awkward in the extreme. Surely I'm overlooking something obvious. // Ben
Re: how to get a list of unmerged revisions?
svn mergeinfo --help B Smith-Mannschott wrote on Mon, Jun 20, 2011 at 00:23:34 +0200: > I've got a trunk and a maintenance branch. I periodically merge > changes from the maintenance branch to trunk. Merge tracking is a > help here. > > Commits on the maintenance branch begin with an ID identifying the > issue, backlog item or user story. When I merge changes to trunk, I'd > like to merge those belonging to the same ID together, but I don't > want to mix different IDs in the same merge. > > To do this, I explicitly name the revisions I want to merge on the command > line. > > Now, how do I get Subversion to tell me which revisions of > have not been merged to ? > > What I've been doing is either (1) firing up TortoiseSVN, which shows > already merged revisions in grey when you start a log viewer from the > merge dialog box or (2) actually doing the merge and then meditating > over the diff of the svn:merge-info property before reverting the > merge again and doing it properly. > > Both of these approaches are awkward in the extreme. Surely I'm > overlooking something obvious. > > // Ben
Custom diff3 command
Hi, I am a Subversion command-line tools user on Windows XP. Version string = svn, version 1.6.12 (r955767) / compiled Jun 21 2010, 16:00:59 I wrote my own diff3 command batch file. We use it on my team to redirect merges thru KDiff3. I have noticed the argument list is not very descriptive. I will follow GNU diff3 terminology: MYFILE, OLDFILE, YOURFILE. Here are the arguments that my diff3 batch files receives: (These arguments seem to follow the GNU diff3 argument style.) 1) -E 2) -m 3) -L 4) .working 5) -L 6) .merge-left.rOLD_REVISION 7) -L 8) .merge-right.rYOUR_REVISION 9) /full/path/to/MYFILE 10) /full/path/to/OLDFILE 11) /full/path/to/YOURFILE In the above argument list, the -L values are not descriptive enough. Can we add the filename as a prefix? Example: .working -> MYFILE.working Such that, if MYFILE = biglib.c, then .working -> biglib.c.working Many thanks, Kevin Connor Arpe Hongkong This email is confidential and subject to important disclaimers and conditions including on offers for the purchase or sale of securities, accuracy and completeness of information, viruses, confidentiality, legal privilege, and legal entity disclaimers, available at http://www.jpmorgan.com/pages/disclosures/email.
