Re: trunk naming best practice question

2013-05-06 Thread Z W
Hi Geoff Thanks for responding. So one would not make builds on trunk directly ? Thanks again On Mon, May 6, 2013 at 9:18 PM, Geoff Hoffman wrote: > It's common to have > > yourrepo >/branches >/tags >/trunk > > Each day, tag the trunk (svn copy) as /tags/ and build that in your >

Re: trunk naming best practice question

2013-05-06 Thread Geoff Hoffman
It's common to have yourrepo /branches /tags /trunk Each day, tag the trunk (svn copy) as /tags/ and build that in your CI tool and push it to your testing server. Branches are typically feature-related or release-related, e.g. /branches/feature-name or /branches/development or /branche

trunk naming best practice question

2013-05-06 Thread Z W
Hi All For the trunk, what's the common practice to name a version of the trunk? We have a trunk and it's not ready for branching. We also feel that we need a more specific name for the trunk than what we have now called version=trunk. However, we can't be specific since we don't know what the bra

Re: mergeinfo deleted and how to recover ?

2013-05-06 Thread Johan Corveleyn
On Mon, May 6, 2013 at 10:59 PM, Z W wrote: > Hi All > > We have been merging from trunk A to branch B; recently another branch C is > created out of trunk A; trunk A is frozen and C has become the new trunk for > us; > > We mistakenly co the trunk C and performed > svn propdel svn:mergeinfo -R >

mergeinfo deleted and how to recover ?

2013-05-06 Thread Z W
Hi All We have been merging from trunk A to branch B; recently another branch C is created out of trunk A; trunk A is frozen and C has become the new trunk for us; We mistakenly co the trunk C and performed svn propdel svn:mergeinfo -R svn revert . svn commit -m "should not have done it" Now whe

Merging from new Trunk question

2013-05-06 Thread Z W
Hi All We have been merging from trunk A to branch B; recently another branch C is created out of trunk A; trunk A is frozen and C has become the new trunk for us; 1- will the mergeinfo in Trunk A be copied over to Trunk C so that we can continue merging from Trunk C to branch B 2- would be there