|
»
»
« Return to Thread: Files automatically removed from Change Sets
Re: Files automatically removed from Change Sets
by Sebastien Daloz
::
Rate this Message:
All files on my Change sets are locally modified, and server modifications
is not the same than my personal changes.
After switching to my private branch, an update has been made to the HEAD
(corresponding to the trunk's HEAD), about 30 files have been updated. Only
2 of these files was locally modified, but 3 files have been removed from
the Change set (1 that was locally modified in addition to 2 other files
that was on the same directory but has not be updated). Another localy
modified file has been updated but kept in the Change set (no other file was
updated in this directory).
But all of these 4 files are still locally modified, 3 was removed from the
Change sets whereas there shouldn't even if "Allow only committable entries"
is checked because there are still different from those of the svn server.
I don't know how updates are made by svn, but I suppose the client first
does a "diff" between the pristine copy of the file and the local modified
file, "reverts" any modification, "updates" the local file to the wanted
revision and finally apply the "diff" previously memorized.
In this case, the file has been "temporarily" identical to the server's
version and then has been removed from the Change set before the "diff" will
be applied.
But in this case, I don't understand why one of these files has been kept
successfully in the Change set.
Best regards,
Sebastien
2009/6/8 syntevo Support <smartsvn@...>
> > I used Modify > Copy within repository to create a new branch on the
> server
> > as a copy of the trunk's HEAD.
>
> Btw, Add Branch has a corresponding "Remote" option.
>
> > The second file that wasn't up-to-date has been kept in the Change sets,
> > maybe because it was the only modified file on this directory ?
>
> That's OK. Change Sets have "Allow only committable entries" option. If
> selected (what's the default when creating a Change Set through SmartSVN),
> unchanged files will be removed automatically.
>
> --
> Best regards,
> Marc Strapetz
> _____________
> syntevo GmbH
> www.syntevo.com
>
[Non-text portions of this message have been removed]
------------------------------------
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/smartsvn/
<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/smartsvn/join
(Yahoo! ID required)
<*> To change settings via email:
mailto:smartsvn-digest@...
mailto:smartsvn-fullfeatured@...
<*> To unsubscribe from this group, send an email to:
smartsvn-unsubscribe@...
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/
is not the same than my personal changes.
After switching to my private branch, an update has been made to the HEAD
(corresponding to the trunk's HEAD), about 30 files have been updated. Only
2 of these files was locally modified, but 3 files have been removed from
the Change set (1 that was locally modified in addition to 2 other files
that was on the same directory but has not be updated). Another localy
modified file has been updated but kept in the Change set (no other file was
updated in this directory).
But all of these 4 files are still locally modified, 3 was removed from the
Change sets whereas there shouldn't even if "Allow only committable entries"
is checked because there are still different from those of the svn server.
I don't know how updates are made by svn, but I suppose the client first
does a "diff" between the pristine copy of the file and the local modified
file, "reverts" any modification, "updates" the local file to the wanted
revision and finally apply the "diff" previously memorized.
In this case, the file has been "temporarily" identical to the server's
version and then has been removed from the Change set before the "diff" will
be applied.
But in this case, I don't understand why one of these files has been kept
successfully in the Change set.
Best regards,
Sebastien
2009/6/8 syntevo Support <smartsvn@...>
> > I used Modify > Copy within repository to create a new branch on the
> server
> > as a copy of the trunk's HEAD.
>
> Btw, Add Branch has a corresponding "Remote" option.
>
> > The second file that wasn't up-to-date has been kept in the Change sets,
> > maybe because it was the only modified file on this directory ?
>
> That's OK. Change Sets have "Allow only committable entries" option. If
> selected (what's the default when creating a Change Set through SmartSVN),
> unchanged files will be removed automatically.
>
> --
> Best regards,
> Marc Strapetz
> _____________
> syntevo GmbH
> www.syntevo.com
>
[Non-text portions of this message have been removed]
------------------------------------
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/smartsvn/
<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/smartsvn/join
(Yahoo! ID required)
<*> To change settings via email:
mailto:smartsvn-digest@...
mailto:smartsvn-fullfeatured@...
<*> To unsubscribe from this group, send an email to:
smartsvn-unsubscribe@...
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/
« Return to Thread: Files automatically removed from Change Sets
| Free embeddable forum powered by Nabble | Forum Help |
