[sldev] Re: Problems merging new LL code with SVK source version control

[Dale Glass]

On Thursday 06 September 2007 23:01:35 Tobias Lang wrote:
> On 9/6/07, Dale Glass <dale at daleglass.net> wrote:
> > Technically, you should avoid working on //mirror paths for this, as
> > the whole point of SVK is to work without being dependent on an
> > external server. Really all that's needed is to svk sync
> > //mirror/secondlife, which should always succeed. Then you can do the
> > whole merge offline, and upload changes to a server whenever
> > convenient.
>
> I see, I guess I will make a local repository then as well, and start
> from scratch...


(CCing this to the list, assuming you sent it only to me by mistake)

My general setup:

//mirror/secondlife -- mirror of LL repository
//mirror/daleglass -- mirror of svn.daleglass.net/sl

//ll -- local copy of //mirror/secondlife
//dg -- local copy of //mirror/daleglass

Technically //ll is probably optional since it's effectively always in 
sync //mirror/secondlife. But I figure it's good for consistency, and in 
case LL ever gives me commit access. Then it'd be useful.

My general work pattern:

# Sync with LL tree. Needs a network connection, obviously.
svk sync //mirror/secondlife

# After this point, everything can be done offline
#############################################

# Merge to local LL copy
svk smerge -Il //mirror/secondlife //ll

# Merge LL branch changes
svk smerge -Il //ll/branches/Branch_1.18.2 //dg/branches/buildfixes_1.18.2

# Merge changes to feature branches
svk smerge -Il //dg/branches/buildfixes //dg/branches/avatarscanner
svk smerge -Il //dg/branches/buildfixes //dg/branches/viewercomm
...

# Do whatever work on the branches is needed
svk commit # (in a branch)

# At this point there's a bunch of changes: New LL merges, new features of 
my own, bugfixes, etc.


# Internet connection needed again
#############################################

# Release to public SVN server
svk smerge //dg //mirror/daleglass



As you can see, an internet connection is only needed very shortly.

Sync with LL will succeed unless something is badly broken (not normal).

Sync with my SVN repository will succeed unless there was a commit to it 
and it conflicts with the changes I'm trying to merge (which won't happen)

Even a few of minutes of connection that aren't timing sensitive at all are 
more than enough to do lots of useful work.

> Sorry, with "s.th" I meant "something". I should be more clear when
> talking about source code ;-)
> It was an error in "llinventorybridge.cpp" with "item" defined several
> times. I never touched this file, so I figured I mixed up some versions
> incorrectly.

Can happen if you merge something that can be merged twice and the change 
happens to be possible to apply twice, I think.

If you didn't change the file you can fix it by brute force by svk copy 
from the original LL code to your.



-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://lists.secondlife.com/pipermail/sldev/attachments/20070906/304461c2/attachment-0001.pgp