[prev in list] [next in list] [prev in thread] [next in thread] 

List:       samba-technical
Subject:    Re: svn commit: samba r428 - in branches/SAMBA_3_0/source:
From:       "Stefan (metze) Metzmacher" <metze () samba ! org>
Date:       2004-04-30 18:31:04
Message-ID: 1104.80.141.89.117.1083349864.squirrel () www ! mx-netz ! de
[Download RAW message or body]

> On Fri, 30 Apr 2004, Stefan (metze) Metzmacher wrote:
>
>> herb@samba.org schrieb:
>>
>> > Author: herb
>> > Date: 2004-04-30 14:28:38 +0000 (Fri, 30 Apr 2004)
>> > New Revision: 428
>> >
>> > Modified:
>> >    branches/SAMBA_3_0/source/include/debug.h
>> >    branches/SAMBA_3_0/source/lib/debug.c
>> >    branches/SAMBA_3_0/source/smbd/posix_acls.c
>> > Log:
>> Hi Herb,
>>
>> please merge this to trunk also
>
> Are there simple steps we can take to merge things to the trunk, or do we
> have to apply the change to the trunk as well?

I have
~/samba/trunk/
~/samba/3.0/
~/samba/4.0/

and do something like this:

cd ~/samba/3.0/
svn status                     #check what files are modified
svn diff |less                 #read the diff
svn ci                         #commit the code
<here I got the revision number printed out e.g. commited as revision 450>

cd ~/samba/trunk/
svn merge -r 449:450 ~/samba/3.0/ ./  #merge the changes made in 3.0
commited as r 450 into my trunk tree
svn status                            #check what files are modified if
there're conflicts
svn diff |less                        #read/check the diff
svn ci                                #commit the merged code


--
metze

Stefan Metzmacher <metze at samba dot org>
[prev in list] [next in list] [prev in thread] [next in thread]