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

[Dale Glass]

On Thursday 06 September 2007 21:33:40 Tobias Lang wrote:
> Thank you for your explanation Dale, but I am still not successful. The
> smerge for 1.18.2 indeed worked well, but I don't get 1.18.3 working.
> After trying I ended up with: *svk merge -ll -r 184:185
> //mirror/secondlife/branches/Branch_1-18-3-Viewer
> //mirror/secondlifeAEL* since the log command revealed that r184 is the

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.

This is the reason I work in //dg and not //mirror/daleglass.

Mind, it should work fine anyway.

> first revision  of the 1-18-3 branch. It merges s.th. but I get compiler
> errors afterwards so s.th. must be wrong.
I don't have a file called s.th in my tree. Where is it and what errors do 
you get?

Merging correctly doesn't guarantee that compilation will work, btw. 
Suppose we have a function that originally says:

S32 foo = 0;

I take that original code, and remove that variable from it.

Then the next version comes from LL, where 50 lines down they add something 
like:
llinfos << "Foo is " << foo << llendl;

Then the merge will add this line to the code, even though I removed the 
declaration. This may very well merge perfectly, but compilation will 
fail.
-------------- 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/e5085051/attachment.pgp