|
List Info
Thread: Switching on wrong branch]
|
|
| Switching on wrong branch] |
|
2006-11-13 16:03:18 |
|
Hello Sebastien,
I think checksum problem could be related to the incorrect behavior of
the switch operation, which I unfortunately couldn't reproduce with the
latest version of JavaSVN.
Could you please send me the directory as it was before "switch"
operation and as it become after it including .svn directories. This
will help to reveal the reason of the problem. After this is fixed we
could return to the checksum problem if it will persist.
Is that correct that you're using http protocol to access repository and
your working copy is in Subversion 1.4 format?
Alexander Kitaev,
TMate Software,
http://tmate.org/
Marc Strapetz wrote:
> Can you please care about the switch-problems?
>;
> --
> Best regards,
> Marc Strapetz
> _____________
> syntevo.com
>
> -------- Original-Nachricht --------
> Betreff: Re: [smartsvn] Switching on wrong branch
> Datum: Fri, 10 Nov 2006 22:22:19 +0100
> Von: Sebastien Daloz < sebastien.daloz%40gmail.com">sebastien.daloz gmail.com>
> Antwort an: smartsvn%40yahoogroups.com">smartsvnyahoogroups.com
> An: smartsvn%40yahoogroups.com">smartsvnyahoogroups.com
> Referenzen:
> < 37e78a9d0611100238u22e04e4asf84b9d55bb23830c%40mail.gmail.com">37e78a9d0611100238u22e04e4asf84b9d55bb23830cmail.gmail.com>
>
>
>
> This may be important :
>
> When I saw my commit was done on the wrong branch (whereas SmartSVN
> displays
> the the other branch on its status bar), I've tried to switch the directory
> on the same branch as the project. A warning wad displayed (checksum
> problem
> on the file which was last commited). Directory has been marked as
> "Incomplete";. After an update, directory become normal.
>
> But whenever I switch this directory to the other branch, then switch once
> again to the same branch as the project, I've the checksum error.
>
> I've also tried to use refresh remote state, and nothing is appeared on the
> remote state column (RC2 version).
>
__._,_.___
.
__,_._,___
|
| Switching on wrong branch] |
|
2006-11-13 16:27:02 |
|
Hi Alexander,
I'm working with HTTP protocol, but I think svn server is 1.3. Is there
anyway to be sure about the version used ?
I can't send you the directory, because sources are confidential, but I'll
try to reproduce it with another project. I just can't say when I would have
time to do that.
Moreover, which switch do you want I send to you ? I've made several
switches :
- First, I checked-out a branch A of the project
- Later, I've done a first switch to another branch B for this whole branch
(sources corresponding to branch A were switched from the root to the branch
B).
- Finally, I've done another switch (the second) from one subdirectory of
the sources (corresponding to branch B) to the branch A.
Structure looks like :
1) CO --> Branch A (check out)
2) Branch A --> Branch B (whole switch)
3) Branch B --> Branch B with 1 subdirectory on Branch A (subdirectory
switch).
PS : I've just see title is not appropriate. It's not really Switching on
wrong branch, but Commit on wrong branch.
--
Best regards,
Sebastien
2006/11/13, Alexander Kitaev < Alexander.Kitaev%40svnkit.com">Alexander.Kitaevsvnkit.com>:
>
> Hello Sebastien,
>
>; I think checksum problem could be related to the incorrect behavior of
> the switch operation, which I unfortunately couldn't reproduce with the
> latest version of JavaSVN.
>
> Could you please send me the directory as it was before "switch"
> operation and as it become after it including .svn directories. This
> will help to reveal the reason of the problem. After this is fixed we
> could return to the checksum problem if it will persist.
>
> Is that correct that you're using http protocol to access repository and
> your working copy is in Subversion 1.4 format?
>
> Alexander Kitaev,
> TMate Software,
> http://tmate.org/
>
[Non-text portions of this message have been removed]
__._,_.___
.
__,_._,___
|
| Switching on wrong branch] |
|
2006-11-13 16:46:59 |
|
Hello Sebastian,
> Structure looks like :
> 1) CO --> Branch A (check out)
> 2) Branch A --> Branch B (whole switch)
> 3) Branch B --> Branch B with 1 subdirectory on Branch A (subdirectory
> switch).
Let's start with the subdirectory state before 3 and after 3. You may
create new directory in your project that contains files that you could
share and try switching it.
>; PS : I've just see title is not appropriate. It's not really Switching
> on wrong branch, but Commit on wrong branch.
I think commit is done to the wrong branch because switch left some
administrative information from the previous branch in the working copy,
so the reason of the problem is really switch operation. You may check
that by looking into wc-props files below .svn directory to see whether
URL there is correct (refers to the correct branch).
Alexander Kitaev,
TMate Software,
http://tmate.org/
Sebastien Daloz wrote:
> Hi Alexander,
>
> I'm working with HTTP protocol, but I think svn server is 1.3. Is there
> anyway to be sure about the version used ?
>
> I can't send you the directory, because sources are confidential, but
> I'll try to reproduce it with another project. I just can't say when I
> would have time to do that.
>;
> Moreover, which switch do you want I send to you ? I've made several
> switches :
> - First, I checked-out a branch A of the project
> - Later, I've done a first switch to another branch B for this whole
> branch (sources corresponding to branch A were switched from the root to
> the branch B).
> - Finally, I've done another switch (the second) from one subdirectory
> of the sources (corresponding to branch B) to the branch A.
>
> Structure looks like :
> 1) CO --> Branch A (check out)
> 2) Branch A --> Branch B (whole switch)
> 3) Branch B --> Branch B with 1 subdirectory on Branch A (subdirectory
> switch).
>
> PS : I've just see title is not appropriate. It's not really Switching
> on wrong branch, but Commit on wrong branch.
>
> --
> Best regards,
> Sebastien
>
>
> 2006/11/13, Alexander Kitaev < Alexander.Kitaev%40svnkit.com">Alexander.Kitaevsvnkit.com
> <mailto: Alexander.Kitaev%40svnkit.com">Alexander.Kitaevsvnkit.com>>:
>
> Hello Sebastien,
>
> I think checksum problem could be related to the incorrect behavior of
> the switch operation, which I unfortunately couldn't reproduce with the
> latest version of JavaSVN.
>
> Could you please send me the directory as it was before "switch"
> operation and as it become after it including .svn directories. This
> will help to reveal the reason of the problem. After this is fixed we
> could return to the checksum problem if it will persist.
>
> Is that correct that you're using http protocol to access repository
> and
> your working copy is in Subversion 1.4 format?
>
> Alexander Kitaev,
> TMate Software,
> http://tmate.org/
>
__._,_.___
.
__,_._,___
|
| Switching on wrong branch] |
|
2006-11-28 10:28:16 |
|
Sorry, I sent this mail to Alexander instead of smartsvn group.
Hi Alexander,
I just ave done a switch on some directories from a branch to another. I
have once again the same problem : SmartSVN has done the commit on several
branches, whereas all files I've committed was in switched directories on
the same branch.
The directories have been switched to the /branches/deliveries/7.2.1abranch.
I've noticed a difference in the props file.
.svn/entries show /branches/ deliveries/7.2.1a whereas
.svn/wcprops/filename shows /branches/7.2.x
Isn't the problem ? I think switch is OK for directories but it continue to
work on the file from another branch.
One information : I think I've modified some files before switching
directories. Maybe it is the problem ?
This difference between .svn/entries and .svn/wcprops/filename only appears
with files that was commited in the wrong branch. Files commited on
deliveries/7.2.1a (where directories are switched) display
/branches/deliveries/7.2.1a.
I just tried to do a recursive switch on deliveries/7.2.1a from the root,
but each time SmartSVN give me an error « Switch cancelled » without
explanations.
Here is the log :
0 [main] INFO smartsvn.system - SmartSVN version 2.1 RC2
16 [main] INFO smartsvn.system - awt.toolkit : "
sun.awt.windows.WToolkit"
16 [main] INFO smartsvn.system - exe4j.consoleCodepage :
"cp0"
16 [main] INFO smartsvn.system - exe4j.launchName :
"C:\Program Files\SmartSVNbin\smartsvn.exe"
16 [main] INFO smartsvn.system - exe4j.moduleName :
"C:\Program Files\SmartSVNbin\smartsvn.exe"
16 [main] INFO smartsvn.system - exe4j.tempDir :
"C:\DOCUME~1\sdz\LOCALS~1\Temp\e4j1E.tmp_dir3727";
16 [main] INFO smartsvn.system - exe4j.unextractedPosition :
"233878"
16 [main] INFO smartsvn.system - file.encoding :
"Cp1252"
16 [main] INFO smartsvn.system - file.encoding.pkg : "
sun.io"
16 [main] INFO smartsvn.system - file.separator :
"\"
16 [main] INFO smartsvn.system - install4j.exeDir :
"C:\Program Files\SmartSVNbin\"
16 [main] INFO smartsvn.system - java.awt.graphicsenv : "
sun.awt.Win32GraphicsEnvironment"
16 [main] INFO smartsvn.system - java.awt.printerjob : "
sun.awt.windows.WPrinterJob "
16 [main] INFO smartsvn.system - java.class.path :
"C:\DOCUME~1\sdz\LOCALS~1\Temp\e4j1E.tmp_dir3727\exe4jlib.jar;C:\Program
Files\SmartSVNbin\..lib\help.jar;C:\Program
Files\SmartSVNbin\..lib\javasvn- cli.jar;C:\Program
Files\SmartSVNbin\..lib\javasvn.jar;C:\Program
Files\SmartSVNbin\..lib\smartsvn.jar;C:\Program
Files\SmartSVNbin\..lib\tools.jar;"
16 [main] INFO smartsvn.system - java.class.version : "
49.0"
16 [main] INFO smartsvn.system - java.endorsed.dirs :
"c:\program files\javajre1.5.0_09\lib\endorsed"
16 [main] INFO smartsvn.system - java.ext.dirs :
"c:\program files\javajre1.5.0_09\lib\ext"
16 [main] INFO smartsvn.system - java.home :
"c:\program files\javajre1.5.0_09"
16 [main] INFO smartsvn.system - java.io.tmpdir :
"C:\DOCUME~1\sdz\LOCALS~1\Temp\"
16 [main] INFO smartsvn.system - java.library.path :
"C:\Program
Files\SmartSVNbin;.;C:\WINDOWSsystem32;C:\WINDOWS;C:\Program
Files\Javajdk1.5.0_ | |