On 5/30/07, Mike Brenner <email@example.com> wrote:
> Hi Andy,
> Why do you think preventing them from
> deleting files would allow them to check
> in the non-SVN generated versions?
Please read what I wrote again. The local people are basically
managing the files through Subversion for an external person who
doesn't have SVN access. What's happening is the files are changing,
but the history is being lost because "version 1" is being deleted,
and then "version 2" of the same file, provided by the external
person, is being added (which SVN treats as a new file).
What *should* happen is the external person should send their updated
version to the local person, who then overlays this new version on top
of what's in their WC, then commits the change.
> How can a weekend-warrior update
> a file on Monday back into the subversion
> environment without svn remove?
What? It would work the same as if I took the files home on a floppy,
and when I came in on Monday copying my files into my WC and
committing the changes. I have no idea what you're getting at, while
staying within the realm of "normal" SVN usage.
> What if 2 weekend warriors make changes,
> and on Monday we would like both sets
> of changes merged into the subversion
The same way you have any other concurrent work. The first person
commits, and the second one finds out that there's a conflict when
they update. Then those two people review their respective versions,
discuss, and merge their changes into a new version which is then
> Again, I know of no solution that does not
> start with "svn remove", but I would love to!
Then either I've completely misunderstood what you're asking, or
you've completely misunderstood Subversion.
> Andy Levy wrote:
> > ... while working with someone who didn't have SVN access.
> > Check out WC
> > Email file from WC to non-SVN user
> > Non-SVN user makes edits & emails the document back
> > User svn rms file from WC, commits.
> > User detaches file from email, places in WC
> > User adds, commits.
> > If I had something in place which prevented them from deleting files,
> > then their file history wouldn't be broken.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Wed May 30 17:40:31 2007