[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Non-Uniform Working Copies

From: Michael Matson <blackhawke.696_at_gmail.com>
Date: Sat, 16 Aug 2014 15:22:40 -0700

Okay.. After receiving the latest upgrade to Subversion for Ubuntu from
Canonical, my wife and I have run across an odd behavior (bug?). As my
signature block betrays, we are indi authors, not coders. We're both
running Ubuntu 12.04lts, she on an Intel box, me on an AMD-64. Here's what

   1. I made about ten thousand edits to my working copy (no, not really,
   but it was a lot) and then committed them to the repository as per normal.
   2. My wife updated her working copy, which contained my edits -- again,
   as per normal.
   3. Then she went to work on the document, and asked me to do some search
   and replace work. I did. Tried to commit but was out of date. No problem.
   4. My ten thousand edits returned from the bit bucket abyss! *She* doesn't
   have them. I didn't have them before the update, because I'm the one who
   deleted the material in the first darned place!
   5. Anyway, I resolved a couple of conflicts and did a "commit after
   resolve" as per normal.
   6. She updated her working copy. Guess what: My edits did *not* return
   from the abyss in her working copy. Her copy remained "clean" (current, up
   to date, whatever)
   7. I committed again. She updated. They STILL didn't show up.
   8. *She* committed again and I updated. My disappeared edits remain in
   my copy!

Now, interestingly enough, the search and replace work I did remained in
place (as it should) through all of this. But *somehow* we now seem have to
"completely correct" (according to the repository anyway) versions of the
document that Subversion thinks are identical, but that are, in fact,
different. My copy has all the deleted material, plus the search and
replace work that I did. Her copy not only has the search and replace work,
but also does *not* have the material I deleted and/or changed back in step
1. (Or so it appears. Quite frankly, I did so much work before committing,
most of it may never be found again, or edited in the same way I did it the
first time. But there was a long list of "TODOs" that I had deleted and
every. single. one. of them re-appeared.

Thanks for your time. I'm sorry if this doesn't include all the technical
information you're used to seeing. While I have nearly 20 years worth of
linux admin experience, as I said, we're authors, not coders or developers,
so my technical knowledge does have limits. :)

Metaphor Publications
Add me to your address book:
Received on 2014-08-17 07:01:04 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.