You will want to read
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
if you plan on using --reintegrate while keeping the branch around.
Thanks! It will save me much time!
On Thu, Apr 28, 2011 at 20:27, Totte Karlsson wrote:
> Someone said that merges are easy.. I have read the svn book about merges
> but it does not help.
>
> I create a branch and I can keep it synchronized with the trunk.
> I can even re-integrate the branch with the trunk.
>
> From now on, it see
On Thu, Apr 28, 2011 at 7:44 PM, Ben Carbery wrote:
> I sometimes forget that I perceive time on a different scale to you mortals.
>
> On 28 April 2011 15:43, Nico Kadel-Garcia wrote:
>>
>> On Wed, Apr 27, 2011 at 8:38 PM, Ben Carbery
>> wrote:
>> > Ok running 1.6 now and repository upgraded. Mu
Someone said that merges are easy.. I have read the svn book about merges but it
does not help.
I create a branch and I can keep it synchronized with the trunk.
I can even re-integrate the branch with the trunk.
From now on, it seems the branch is useless since I can't continue working on
it a
I sometimes forget that I perceive time on a different scale to you mortals.
On 28 April 2011 15:43, Nico Kadel-Garcia wrote:
> On Wed, Apr 27, 2011 at 8:38 PM, Ben Carbery
> wrote:
> > Ok running 1.6 now and repository upgraded. Must have been a recent RH
> > patch?
>
> Not recent: it was publ
"Bert Huijben" wrote on 04/28/2011 01:18:09 PM:
> > On 4/28/11 9:42 AM, Danil Shopyrin wrote:
> > >> are there any arguments to prefer Windows? (beside arguments that
you
> > drive
> > >> a Windows shop)
> > >> ok, looks like I have to adjust the section a bit.
> > >
> > > It's also very importan
> -Original Message-
> From: Blair Zajac [mailto:bl...@orcaware.com]
> Sent: donderdag 28 april 2011 19:39
> To: Danil Shopyrin
> Cc: Michael Hüttermann; Bob Archer; users@subversion.apache.org
> Subject: Re: repo on Windows -- why not?
>
> On 4/28/11 9:42 AM, Danil Shopyrin wrote:
> >>
[ Please CC: me since I am not subscribed to the list. Thank you. ]
Hi,
I'd like to report what I think is a yet another bug in SVN 1.6.16.
(Seems that SVN bugs are currently liking me...) I reproduced it both
with the command line client and with TortoiseSVN for Windows.
When you have two branc
On 4/28/11 9:42 AM, Danil Shopyrin wrote:
are there any arguments to prefer Windows? (beside arguments that you drive
a Windows shop)
ok, looks like I have to adjust the section a bit.
It's also very important to integrate Subversion seamlessly with
Active Directory and other existing Windows i
> are there any arguments to prefer Windows? (beside arguments that you drive
> a Windows shop)
> ok, looks like I have to adjust the section a bit.
It's also very important to integrate Subversion seamlessly with
Active Directory and other existing Windows infrastructure (it applies
to Windows sh
> > Perhaps
> >
> > [/]
> > ~jon = rw
>
> Nope. jon still able to check out the entire repository tree.
>
> So far, it seems that the only rules that make any difference are
> "* ="
> and "$authenticated =". These give everybody access. Without one of
> these present, nobody has access. And now I
On Thu, Apr 28, 2011 at 5:10 AM, Nico Kadel-Garcia wrote:
> According to the paper, you *are*. You're mirring the backend
> Subversion databases on the multiple servers, keeping them
> synchronized by accepting only authorized transactions on a designated
> "master" and relaying them to the ot
Ulrich Eckhardt wrote on Thu, Apr 28, 2011 at 12:27:07 +0200:
> On Thursday 28 April 2011, List Man wrote:
> > I want to take one project from one repo and put it in a directory under
> > another repo. Is it possible to keep the history of said project?
>
> No, not through the client interface, w
On Apr 28, 2011, at 05:27, Ulrich Eckhardt wrote:
> On Thursday 28 April 2011, List Man wrote:
>> I want to take one project from one repo and put it in a directory under
>> another repo. Is it possible to keep the history of said project?
>
> No, not through the client interface, which is what y
Ok, then I'm out of ideas. Maybe someone else still has some suggestions?
Johan
On Wed, Apr 27, 2011 at 1:12 PM, Platz, Steve wrote:
> Same thing there as well.
>
> -Original Message-
> From: Johan Corveleyn [mailto:jcor...@gmail.com]
> Sent: Tuesday, April 26, 2011 4:15 PM
> To: Platz,
On Thursday 28 April 2011, List Man wrote:
> I want to take one project from one repo and put it in a directory under
> another repo. Is it possible to keep the history of said project?
No, not through the client interface, which is what you use for everyday work.
If you have direct access to th
On Apr 27, 2011, at 20:06, Tony Butt wrote:
> On Wed, 2011-04-27 at 02:05 -0500, Ryan Schmidt wrote:
>> Do educate on which files should have svn:eol-style set to what value, and
>> do encourage developers to use auto-props to automate what they learned, but
>> also install a pre-commit hook scri
Hi,
Just to let everyone know that the problem turned out to be that SSL
applications on Windows (the TortoiseSVN client in our case) lookup
www.download.windowsupdate.com to get updates to the certificate revocation
list. See http://support.microsoft.com/kb/317541
We operate in an environment
18 matches
Mail list logo
