Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

On 16.03.2015 22:15, Pete Harlan wrote: > On Mon, Mar 16, 2015 at 12:31 PM, Branko Čibej wrote: >>> A colleague argued that creating the mergeinfo for a subtree in this >>> case (root->root merge) is a simple bug because mergeinfo says what >>> inputs were considered to come up with the result, no

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 4:33 PM, Lathan Bidwell wrote: > >> >> I usually think in revision numbers or tag names instead of pretending >> there was only one. If, instead of tracking HEAD, you copied each >> release to a new TAG with your own naming scheme you could just switch >> your production wo

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 5:24 PM, Les Mikesell wrote: > On Mon, Mar 16, 2015 at 4:04 PM, Lathan Bidwell > wrote: > > > >> > >> Don't you really want to just 'svn switch' your production workspace > >> to the new production target url instead of deleting and checking out > >> again? As long as th

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 4:04 PM, Lathan Bidwell wrote: > >> >> Don't you really want to just 'svn switch' your production workspace >> to the new production target url instead of deleting and checking out >> again? As long as the content shares ancestry it should just move the >> differences. >>

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 5:15 PM, wrote: > > On Mar 16, 2015, at 2:04 PM, Lathan Bidwell wrote: > > > > On Mon, Mar 16, 2015 at 4:44 PM, Les Mikesell > wrote: > >> On Mon, Mar 16, 2015 at 3:16 PM, Lathan Bidwell >> wrote: >> > >> >> >> >> > I have a content management system running on top of S

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

On Mon, Mar 16, 2015 at 12:31 PM, Branko Čibej wrote: >> A colleague argued that creating the mergeinfo for a subtree in this >> case (root->root merge) is a simple bug because mergeinfo says what >> inputs were considered to come up with the result, not just those that >> were used. >> >> 1. If t

Re: Merge trunk and prod directories without workspace

> On Mar 16, 2015, at 2:04 PM, Lathan Bidwell wrote: > > > > On Mon, Mar 16, 2015 at 4:44 PM, Les Mikesell > wrote: > On Mon, Mar 16, 2015 at 3:16 PM, Lathan Bidwell > wrote: > > > >> > >> > I have a content management system running o

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 4:44 PM, Les Mikesell wrote: > On Mon, Mar 16, 2015 at 3:16 PM, Lathan Bidwell > wrote: > > > >> > >> > I have a content management system running on top of SVN. My web > servers > >> > run a post commit hook that does svn update off of svnlook after every > >> > commit.

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 3:16 PM, Lathan Bidwell wrote: > >> >> > I have a content management system running on top of SVN. My web servers >> > run a post commit hook that does svn update off of svnlook after every >> > commit. >> > >> > I currently have a "Publish" operation which I implement by d

Re: Merge trunk and prod directories without workspace

On Mon, Mar 16, 2015 at 3:15 PM, Ryan Schmidt < subversion-2...@ryandesign.com> wrote: > > On Mar 16, 2015, at 8:19 AM, Lathan Bidwell wrote: > > > I have a content management system running on top of SVN. My web servers > run a post commit hook that does svn update off of svnlook after every > co

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

On 16.03.2015 19:02, Pete Harlan wrote: > On Sat, Mar 14, 2015 at 4:05 PM, Pete Harlan wrote: >> As you pointed out, my original report erroneously focused on >> svn:mergeinfo appearing, when the real issue is that the new >> svn:mergeinfo doesn't disappear (still) when the user marks the >> confl

Re: Subversion 1.9 working copy compatibility

On 16.03.2015 17:49, Bert Huijben wrote: > >> -Original Message- >> From: Marc Strapetz [mailto:marc.strap...@syntevo.com] >> Sent: maandag 16 maart 2015 17:14 >> To: users@subversion.apache.org >> Subject: Re: Subversion 1.9 working copy compatibility >> >> On 16.03.2015 16:34, Branko Čibe

Re: Merge trunk and prod directories without workspace

On Mar 16, 2015, at 8:19 AM, Lathan Bidwell wrote: > I have a content management system running on top of SVN. My web servers run > a post commit hook that does svn update off of svnlook after every commit. > > I currently have a "Publish" operation which I implement by doing svn delete > $pro

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

On Sat, Mar 14, 2015 at 4:05 PM, Pete Harlan wrote: > As you pointed out, my original report erroneously focused on > svn:mergeinfo appearing, when the real issue is that the new > svn:mergeinfo doesn't disappear (still) when the user marks the > conflict resolved. (And I haven't found a way to r

RE: Subversion 1.9 working copy compatibility

> -Original Message- > From: Marc Strapetz [mailto:marc.strap...@syntevo.com] > Sent: maandag 16 maart 2015 17:14 > To: users@subversion.apache.org > Subject: Re: Subversion 1.9 working copy compatibility > > On 16.03.2015 16:34, Branko Čibej wrote:> On 16.03.2015 15:58, Marc > Strapetz

Re: Subversion 1.9 working copy compatibility

On 16.03.2015 16:34, Branko Čibej wrote:> On 16.03.2015 15:58, Marc Strapetz wrote: From my experiments with Subversion 1.9 binaries and the listed changes in the release notes, Subversion 1.9 seems to be backwards compatible with Subversion 1.8 working copies. Is that correct? There are no sc

Re: Subversion 1.9 working copy compatibility

On 16.03.2015 15:58, Marc Strapetz wrote: > From my experiments with Subversion 1.9 binaries and the listed > changes in the release notes, Subversion 1.9 seems to be backwards > compatible with Subversion 1.8 working copies. Is that correct? There are no schema changes, but 1.9 is faster at many

Subversion 1.9 working copy compatibility

From my experiments with Subversion 1.9 binaries and the listed changes in the release notes, Subversion 1.9 seems to be backwards compatible with Subversion 1.8 working copies. Is that correct? If so, it makes sense to update the "Upgrading the Working Copy" section: https://subversion.apache

Merge trunk and prod directories without workspace

Hi, I have a content management system running on top of SVN. My web servers run a post commit hook that does svn update off of svnlook after every commit. I currently have a "Publish" operation which I implement by doing svn delete $prod_url && svn cp $trunk_url $prod_url. (both repo urls) This

Reoganizing svn structure and error "shares no common ancestry"

Hi, finally we would like to restructure our badly structured svn repo. Over time a lot of stuff flew into this repo. I have used kdesvn for moving the trees online in the repo. kdesvn does a copy and delete when moving. I have also tried to use a svn move. Steps were as follows: 1. Created a ne

Re: Exception: libsvn_wc\update_editor.c line 1550: assertion failed (action == svn_wc_conflict_action_delete)

Bert Huijben wrote on Sun, Mar 15, 2015 at 10:08:00 +: > Yes, we probably should. > Looks like you just did, in r1666832. Thanks. Nominate it for backport? % nominate.pl r1666832 "Resolves an assertion" :-) Daniel > > The problem here is an editor that drives a file or directory add in