Re: svn status merges intersected external records into single row

2017-06-30 Thread Johan Corveleyn
On Fri, Jun 30, 2017 at 7:52 AM, Johan Corveleyn wrote: > On Fri, Jun 30, 2017 at 4:12 AM, Daniel Shahaf > wrote: >> Johan Corveleyn wrote on Fri, 30 Jun 2017 00:06 +0200: >>> Summarized, you're saying that with this svn:externals definition: >>> >>> ^/dir1/dir1_subdir1 ext/dir1_subdir1 >>>

Re: "Unable to parse reversed revision range" when merging from trunk to branch

2017-06-30 Thread Johan Corveleyn
On Fri, Jun 30, 2017 at 6:10 PM, Jens Christian Restemeier wrote: > I narrowed it down to somewhere in update_wc_mergeinfo. At the start of the > function where it gets the mergeinfo for the root directory it is: > /trunk:15014-19472,19473-19612*,19613-19614,19615-19630*,19631-19634,19635-2 > 0055

RE: "Unable to parse reversed revision range" when merging from trunk to branch

2017-06-30 Thread Jens Christian Restemeier
I narrowed it down to somewhere in update_wc_mergeinfo. At the start of the function where it gets the mergeinfo for the root directory it is: /trunk:15014-19472,19473-19612*,19613-19614,19615-19630*,19631-19634,19635-2 0055* A bit later where this gets parsed again from svn_wc_canonicalize_svn_pr

Re: "Unable to parse reversed revision range" when merging from trunk to branch

2017-06-30 Thread Stefan Sperling
On Fri, Jun 30, 2017 at 01:59:02PM +0100, Jens Christian Restemeier wrote: > I can add some diagnostics to the mergeinfo parser, though I've got some work > to finish first. Please do. Don't forget to pack a pickaxe, a torch, and some elixirs to restore HP.

RE: "Unable to parse reversed revision range" when merging from trunk to branch

2017-06-30 Thread Jens Christian Restemeier
I made a clean checkout of the same branch onto my Linux machine, to make sure the workspace doesn't contain any odd leftover data. The workspace is sparse, it excludes a few folders at the root level contain only data that is irrelevant for code work. It's the same checkout as on my Windows ma

Tip of the day: Cheatsheet for common cmdline client operations

2017-06-30 Thread Daniel Shahaf
I just ran into the following cheatsheet: http://www.chim.unifi.it/~signo/did/etc/subversion/neat.html It covers the normal multi-user workflow, branching, etc.. (Kudos to the author, Giorgio Signorini, not to me.) Cheers, Daniel [bcc: author]

Re: Merging file to file requires specifying source file by its URL

2017-06-30 Thread Daniel Shahaf
Branko Čibej wrote on Fri, 30 Jun 2017 06:18 +0200: > On 30.06.2017 06:04, Daniel Shahaf wrote: > > I'm trying to merge trunk/CHANGES into branches/1.9.x/CHANGES. I have > > two separate working copies: the current directory (./) is a working > > copy of branches/1.9.x and ../wc-of-trunk is a work

Re: Facing issues in Enable editing log messages.

2017-06-30 Thread Branko Čibej
On 30.06.2017 09:00, Ramamurthy, Manochitra wrote: > > Hi Eric, > > > > It’s still unresolved issue. As per your suggestion few days back, I > tried to reset password for CSVN username. Please refer the screenshots. > You're using the wrong password for 'csvn' for the Subversion server. Not your