Re: question on merging revisions/svn patch

[Stefan Sperling]

On Mon, Apr 22, 2019 at 01:29:15PM -0400, Kathleen Warren wrote:
> Hi all,
> 
> I've gotten myself into a bit of a svn merging funk and I'd like to know if
> my proposed solution will cause further errors.
> 
> Due to a misunderstanding of how svn handles mergeinfo, I merged several
> commits from branch A into trunk like so: svn merge -c 1,2,3 ^/branches/A,
> with the idea of merging all three of those commits into branch B and only
> one into branch C.
> I realized when attempting to merge from trunk to branches B, C that I
> couldn't merge from trunk to get the content of those merges unless I
> specified the merge commit (let's call it revision 4) rather than any one
> or all of merges 1,2,3 as before.
> So I merged the merge commit into branch B, so now branch B has the content
> changes I want.
> But what about branch C? I only want one of those commits. My idea was to
> record a mergeinfo change and manually apply the patch and commit THAT -
> will that cause bad merge conflicts down the line?
> Thanks,
> Kathleen

Hi Kathleen,

Have you considered merging the change in question directly from branch A
to branch C, instead of merging the merged change from trunk to branch C?
Merging into C like this should work: svn merge -c 2 ^/branches/A

Whether or not you'll see conflicts down the line is hard to say
without knowing more about the nature of these changes.

Regards,
Stefan

question on merging revisions/svn patch

[Kathleen Warren]

Hi all,

I've gotten myself into a bit of a svn merging funk and I'd like to know if
my proposed solution will cause further errors.

Due to a misunderstanding of how svn handles mergeinfo, I merged several
commits from branch A into trunk like so: svn merge -c 1,2,3 ^/branches/A,
with the idea of merging all three of those commits into branch B and only
one into branch C.
I realized when attempting to merge from trunk to branches B, C that I
couldn't merge from trunk to get the content of those merges unless I
specified the merge commit (let's call it revision 4) rather than any one
or all of merges 1,2,3 as before.
So I merged the merge commit into branch B, so now branch B has the content
changes I want.
But what about branch C? I only want one of those commits. My idea was to
record a mergeinfo change and manually apply the patch and commit THAT -
will that cause bad merge conflicts down the line?
Thanks,
Kathleen

svn version 1.10 lack of robustness in presence of flaky network

[Marlow, Andrew]

Hello everyone,

I got this error below during an svn co command. It left my workspace in a bad 
state from which I had to do svn cleanup before trying again (the retry worked):

svn: E200033: Another process is blocking the working copy database, or the 
underlying filesystem does not support file locking; if the working copy is on 
a network filesystem, make sure file locking has been enabled on the file server
svn: E200033: sqlite[S5]: database is locked
svn: E200042: Additional errors:
svn: E200033: sqlite[S5]: database is locked
svn: E200030: sqlite[S1]: cannot start a transaction within a transaction
svn: E200030: sqlite[S1]: cannot start a transaction within a transaction

I think this happens when the network is flaky. This error happened on windows 
but I have also seen it happen on solaris 10.  Has anyone else seen this? If it 
is due to network flakiness then perhaps svn should retry to work around this 
transparently, and thus be more robust? Perhaps it could retry up to 3 times 
with a sleep a 1 second between retries?

Andrew Marlow
Consultant developer, Apex
38th Floor, 25 Canada Square,
Canary Wharf, London E14 5LQ
T:  020-8081-2367 / 07966-451-521
E: andrew.mar...@fisglobal.com
FIS | Empowering the Financial World [cid:image001.png@01D112FA.C4A77D90] 
 [cid:image002.png@01D112FA.C4A77D90] 
 [cid:image003.png@01D112FA.C4A77D90] 

FIS Apex (UK) Limited * Registered in England and Wales No. 3573008 * 
Registered Office: 38th floor, 25 Canada Square, London, E14 5LQ, United Kingdom
[50_3]

The information contained in this message is proprietary and/or confidential. 
If you are not the intended recipient, please: (i) delete the message and all 
copies; (ii) do not disclose, distribute or use the message in any manner; and 
(iii) notify the sender immediately. In addition, please be aware that any 
message addressed to our domain is subject to archiving and review by persons 
other than the intended recipient. FIS is a trading name of the following 
companies: Fidelity Information Services Ltd (registered in England 
No.02225203), FIS Payments (UK) Ltd (No.04215488), FIS Asiapacrim Holdings Ltd 
(No.06707320), Certegy Card Services Ltd (No.03517639) and Efunds International 
Ltd (No.01930117), all with their registered office at Floor 1, 51/53 Hagley 
Road, Birmingham B16 8TU, United Kingdom; and FIS Payments (Ireland) Ltd 
(registered in Ireland No.126879), with its registered office at 25/28 North 
Wall Quay, Dublin 1, D01 H104, Ireland. FIS Payments (UK) Ltd is authorised and 
regulated by the Financial Conduct Authority; some services are covered by the 
Financial Ombudsman Service (in the UK). Calls to and from the companies may be 
recorded for quality purposes. All of the above companies are part of FIS 
(Fidelity National Information Services Inc.).