Evaluating on Mac -- Problems with Conflict Solver
|
View:
New views
9 Messages
—
Rating Filter:
Alert me
|
 |
Evaluating on Mac -- Problems with Conflict Solver
by Kevin N. Emslie Sarsen
::
Rate this Message:
I just started evaluating SmartSVN, primarily for its merge feature.
Unfortunately, the Conflict Solver doesn't allow me to resolve any of the conflicts. The files display but there's no way to edit anything. Can someone tell me what I'm missing? Kevin N. Emslie Sarsen kevinsarsen@... [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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by syntevo Support-3
::
Rate this Message:
Hi Kevin,
In the (built-in) Conflict Solver you should (by default) see three files right beside each other. At least the center file content should be editable if the file on your disk is editable. -- Best regards, Thomas Singer ============= syntevo GmbH http://www.syntevo.com "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > I just started evaluating SmartSVN, primarily for its merge feature. > Unfortunately, the Conflict Solver doesn't allow me to resolve any of > the conflicts. The files display but there's no way to edit > anything. Can someone tell me what I'm missing? > > Kevin N. Emslie Sarsen > kevinsarsen@... ------------------------------------ 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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by Kevin N. Emslie Sarsen
::
Rate this Message:
Thanks for the reply, Tom. That's what I thought. Unfortunately,
that's not the behavior I'm seeing. If I use an external merge application (DiffMerge) it works (I can edit the center file) as expected but the built-in Conflict Solver won't allow me to edit anything. I've verified that the file is editable so am quite confused. I'd prefer to use the built-in Conflict Solver if at all possible, so any help would be appreciated. I'm running a MacBook Pro with OS X 10.4.11, if that's any help. Kevin N. Emslie Sarsen kevinsarsen@... On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > Hi Kevin, > > In the (built-in) Conflict Solver you should (by default) see three > files > right beside each other. At least the center file content should be > editable > if the file on your disk is editable. > > -- > Best regards, > Thomas Singer > ============= > syntevo GmbH > http://www.syntevo.com > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > I just started evaluating SmartSVN, primarily for its merge feature. > > Unfortunately, the Conflict Solver doesn't allow me to resolve > any of > > the conflicts. The files display but there's no way to edit > > anything. Can someone tell me what I'm missing? > > > > Kevin N. Emslie Sarsen > > kevinsarsen@... > [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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by syntevo Support-3
::
Rate this Message:
Hi Kevin,
I can't reproduce your described behaviour on our OS X 10.5.7 system (although this OS X difference should not matter). What file permissions the file in question has ("ls -al")? Is the svn:needs-lock property set for the file? -- Best regards, Thomas Singer ============= syntevo GmbH http://www.syntevo.com "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > Thanks for the reply, Tom. That's what I thought. Unfortunately, > that's not the behavior I'm seeing. If I use an external merge > application (DiffMerge) it works (I can edit the center file) as > expected but the built-in Conflict Solver won't allow me to edit > anything. I've verified that the file is editable so am quite > confused. I'd prefer to use the built-in Conflict Solver if at all > possible, so any help would be appreciated. > > I'm running a MacBook Pro with OS X 10.4.11, if that's any help. > > Kevin N. Emslie Sarsen > kevinsarsen@... > > > > On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > > > > > Hi Kevin, > > > > In the (built-in) Conflict Solver you should (by default) see three > > files > > right beside each other. At least the center file content should be > > editable > > if the file on your disk is editable. > > > > -- > > Best regards, > > Thomas Singer > > ============= > > syntevo GmbH > > http://www.syntevo.com > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > I just started evaluating SmartSVN, primarily for its merge feature. > > > Unfortunately, the Conflict Solver doesn't allow me to resolve > > any of > > > the conflicts. The files display but there's no way to edit > > > anything. Can someone tell me what I'm missing? > > > > > > Kevin N. Emslie Sarsen > > > kevinsarsen@... > > > > > > [Non-text portions of this message have been removed] > > > > ------------------------------------ > > Yahoo! Groups Links > > > > ------------------------------------ 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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by Kevin N. Emslie Sarsen
::
Rate this Message:
Thomas,
The svn:needs-lock property is not set. I checked permissions as you suggested and owner (me) had read and write, group and all had read only. Just for fun, I reset the permissions (chmod 777), but that had no effect. Here's my sequence of actions that results in this behavior: 1) Open my project 2) From the Modify menu I select Merge 3) Select to Merge from branch, then select a range of revisions to merge  4) Click on preview 5) Double-click on a file showing a conflict to open it with Conflict Solver  Kevin N. Emslie Sarsen kevinsarsen@... On Jun 29, 2009, at 4:08 AM, syntevo Support wrote: > > > Hi Kevin, > > I can't reproduce your described behaviour on our OS X 10.5.7 > system (although > this OS X difference should not matter). What file permissions the > file in > question has ("ls -al")? Is the svn:needs-lock property set for the > file? > > -- > Best regards, > Thomas Singer > ============= > syntevo GmbH > http://www.syntevo.com > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > Thanks for the reply, Tom. That's what I thought. Unfortunately, > > that's not the behavior I'm seeing. If I use an external merge > > application (DiffMerge) it works (I can edit the center file) as > > expected but the built-in Conflict Solver won't allow me to edit > > anything. I've verified that the file is editable so am quite > > confused. I'd prefer to use the built-in Conflict Solver if at all > > possible, so any help would be appreciated. > > > > I'm running a MacBook Pro with OS X 10.4.11, if that's any help. > > > > Kevin N. Emslie Sarsen > > kevinsarsen@... > > > > > > > > On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > > > > > > > > > Hi Kevin, > > > > > > In the (built-in) Conflict Solver you should (by default) see > three > > > files > > > right beside each other. At least the center file content > should be > > > editable > > > if the file on your disk is editable. > > > > > > -- > > > Best regards, > > > Thomas Singer > > > ============= > > > syntevo GmbH > > > http://www.syntevo.com > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > I just started evaluating SmartSVN, primarily for its merge > feature. > > > > Unfortunately, the Conflict Solver doesn't allow me to resolve > > > any of > > > > the conflicts. The files display but there's no way to edit > > > > anything. Can someone tell me what I'm missing? > > > > > > > > Kevin N. Emslie Sarsen > > > > kevinsarsen@... > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > ------------------------------------ > > > > Yahoo! Groups Links > > > > > > > > > > [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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by syntevo Support-3
::
Rate this Message:
> 4) Click on preview
> 5) Double-click on a file showing a conflict to open it with Conflict > Solver For the Merge Preview, the conflict solver should actually be read-only, as it makes no sense to modify files here. That's already the case for the built-in conflict solver. For 6.0.3 also the temporary files will be set to read-only so external tools will not allow to edit these files. -- Best regards, Marc Strapetz _____________ syntevo GmbH www.syntevo.com "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > Thomas, > > The svn:needs-lock property is not set. I checked permissions as you > suggested and owner (me) had read and write, group and all had read > only. Just for fun, I reset the permissions (chmod 777), but that > had no effect. > > Here's my sequence of actions that results in this behavior: > 1) Open my project > 2) From the Modify menu I select Merge > 3) Select to Merge from branch, then select a range of revisions to > merge >  > 4) Click on preview > 5) Double-click on a file showing a conflict to open it with Conflict > Solver >  > > > Kevin N. Emslie Sarsen > kevinsarsen@... > > > > > On Jun 29, 2009, at 4:08 AM, syntevo Support wrote: > > > > > > > Hi Kevin, > > > > I can't reproduce your described behaviour on our OS X 10.5.7 > > system (although > > this OS X difference should not matter). What file permissions the > > file in > > question has ("ls -al")? Is the svn:needs-lock property set for the > > file? > > > > -- > > Best regards, > > Thomas Singer > > ============= > > syntevo GmbH > > http://www.syntevo.com > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > Thanks for the reply, Tom. That's what I thought. Unfortunately, > > > that's not the behavior I'm seeing. If I use an external merge > > > application (DiffMerge) it works (I can edit the center file) as > > > expected but the built-in Conflict Solver won't allow me to edit > > > anything. I've verified that the file is editable so am quite > > > confused. I'd prefer to use the built-in Conflict Solver if at all > > > possible, so any help would be appreciated. > > > > > > I'm running a MacBook Pro with OS X 10.4.11, if that's any help. > > > > > > Kevin N. Emslie Sarsen > > > kevinsarsen@... > > > > > > > > > > > > On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > > > > > > > > > > > > > Hi Kevin, > > > > > > > > In the (built-in) Conflict Solver you should (by default) see > > three > > > > files > > > > right beside each other. At least the center file content > > should be > > > > editable > > > > if the file on your disk is editable. > > > > > > > > -- > > > > Best regards, > > > > Thomas Singer > > > > ============= > > > > syntevo GmbH > > > > http://www.syntevo.com > > > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > > > I just started evaluating SmartSVN, primarily for its merge > > feature. > > > > > Unfortunately, the Conflict Solver doesn't allow me to resolve > > > > any of > > > > > the conflicts. The files display but there's no way to edit > > > > > anything. Can someone tell me what I'm missing? > > > > > > > > > > Kevin N. Emslie Sarsen > > > > > kevinsarsen@... > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > > > > > ------------------------------------ > > > > > > Yahoo! Groups Links > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > ------------------------------------ > > Yahoo! Groups Links > > > > ------------------------------------ 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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by Kevin N. Emslie Sarsen
::
Rate this Message:
Ah....
So, at what point can I solve conflicts prior to a merge? Kevin N. Emslie Sarsen kevinsarsen@... On Jun 30, 2009, at 2:10 AM, syntevo Support wrote: > > > > 4) Click on preview > > 5) Double-click on a file showing a conflict to open it with > Conflict > > Solver > > For the Merge Preview, the conflict solver should actually be read- > only, as it > makes no sense to modify files here. That's already the case for > the built-in > conflict solver. For 6.0.3 also the temporary files will be set to > read-only > so external tools will not allow to edit these files. > > -- > Best regards, > Marc Strapetz > _____________ > syntevo GmbH > www.syntevo.com > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > Thomas, > > > > The svn:needs-lock property is not set. I checked permissions as you > > suggested and owner (me) had read and write, group and all had read > > only. Just for fun, I reset the permissions (chmod 777), but that > > had no effect. > > > > Here's my sequence of actions that results in this behavior: > > 1) Open my project > > 2) From the Modify menu I select Merge > > 3) Select to Merge from branch, then select a range of revisions to > > merge > >  > > 4) Click on preview > > 5) Double-click on a file showing a conflict to open it with > Conflict > > Solver > >  > > > > > > Kevin N. Emslie Sarsen > > kevinsarsen@... > > > > > > > > > > On Jun 29, 2009, at 4:08 AM, syntevo Support wrote: > > > > > > > > > > > Hi Kevin, > > > > > > I can't reproduce your described behaviour on our OS X 10.5.7 > > > system (although > > > this OS X difference should not matter). What file permissions the > > > file in > > > question has ("ls -al")? Is the svn:needs-lock property set for > the > > > file? > > > > > > -- > > > Best regards, > > > Thomas Singer > > > ============= > > > syntevo GmbH > > > http://www.syntevo.com > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > Thanks for the reply, Tom. That's what I thought. Unfortunately, > > > > that's not the behavior I'm seeing. If I use an external merge > > > > application (DiffMerge) it works (I can edit the center file) as > > > > expected but the built-in Conflict Solver won't allow me to edit > > > > anything. I've verified that the file is editable so am quite > > > > confused. I'd prefer to use the built-in Conflict Solver if > at all > > > > possible, so any help would be appreciated. > > > > > > > > I'm running a MacBook Pro with OS X 10.4.11, if that's any help. > > > > > > > > Kevin N. Emslie Sarsen > > > > kevinsarsen@... > > > > > > > > > > > > > > > > On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > > > > > > > > > > > > > > > > > Hi Kevin, > > > > > > > > > > In the (built-in) Conflict Solver you should (by default) see > > > three > > > > > files > > > > > right beside each other. At least the center file content > > > should be > > > > > editable > > > > > if the file on your disk is editable. > > > > > > > > > > -- > > > > > Best regards, > > > > > Thomas Singer > > > > > ============= > > > > > syntevo GmbH > > > > > http://www.syntevo.com > > > > > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > > > > > I just started evaluating SmartSVN, primarily for its merge > > > feature. > > > > > > Unfortunately, the Conflict Solver doesn't allow me to > resolve > > > > > any of > > > > > > the conflicts. The files display but there's no way to edit > > > > > > anything. Can someone tell me what I'm missing? > > > > > > > > > > > > Kevin N. Emslie Sarsen > > > > > > kevinsarsen@... > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > > > > > > > > > ------------------------------------ > > > > > > > > Yahoo! Groups Links > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > ------------------------------------ > > > > Yahoo! Groups Links > > > > > > > > > > [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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by syntevo Support-3
::
Rate this Message:
> So, at what point can I solve conflicts prior to a merge?
This is not possible. But SVN/SmartSVN will keep all important files (especially your modified working copy) in case of a conflict, so it will be no problem to solve/revert once it has occurred. -- Best regards, Marc Strapetz _____________ syntevo GmbH www.syntevo.com "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > Ah.... > > So, at what point can I solve conflicts prior to a merge? > > Kevin N. Emslie Sarsen > kevinsarsen@... > > > > > On Jun 30, 2009, at 2:10 AM, syntevo Support wrote: > > > > > > > > 4) Click on preview > > > 5) Double-click on a file showing a conflict to open it with > > Conflict > > > Solver > > > > For the Merge Preview, the conflict solver should actually be read- > > only, as it > > makes no sense to modify files here. That's already the case for > > the built-in > > conflict solver. For 6.0.3 also the temporary files will be set to > > read-only > > so external tools will not allow to edit these files. > > > > -- > > Best regards, > > Marc Strapetz > > _____________ > > syntevo GmbH > > www.syntevo.com > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > Thomas, > > > > > > The svn:needs-lock property is not set. I checked permissions as you > > > suggested and owner (me) had read and write, group and all had read > > > only. Just for fun, I reset the permissions (chmod 777), but that > > > had no effect. > > > > > > Here's my sequence of actions that results in this behavior: > > > 1) Open my project > > > 2) From the Modify menu I select Merge > > > 3) Select to Merge from branch, then select a range of revisions to > > > merge > > >  > > > 4) Click on preview > > > 5) Double-click on a file showing a conflict to open it with > > Conflict > > > Solver > > >  > > > > > > > > > Kevin N. Emslie Sarsen > > > kevinsarsen@... > > > > > > > > > > > > > > > On Jun 29, 2009, at 4:08 AM, syntevo Support wrote: > > > > > > > > > > > > > > > Hi Kevin, > > > > > > > > I can't reproduce your described behaviour on our OS X 10.5.7 > > > > system (although > > > > this OS X difference should not matter). What file permissions the > > > > file in > > > > question has ("ls -al")? Is the svn:needs-lock property set for > > the > > > > file? > > > > > > > > -- > > > > Best regards, > > > > Thomas Singer > > > > ============= > > > > syntevo GmbH > > > > http://www.syntevo.com > > > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > > > Thanks for the reply, Tom. That's what I thought. Unfortunately, > > > > > that's not the behavior I'm seeing. If I use an external merge > > > > > application (DiffMerge) it works (I can edit the center file) as > > > > > expected but the built-in Conflict Solver won't allow me to edit > > > > > anything. I've verified that the file is editable so am quite > > > > > confused. I'd prefer to use the built-in Conflict Solver if > > at all > > > > > possible, so any help would be appreciated. > > > > > > > > > > I'm running a MacBook Pro with OS X 10.4.11, if that's any help. > > > > > > > > > > Kevin N. Emslie Sarsen > > > > > kevinsarsen@... > > > > > > > > > > > > > > > > > > > > On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > > > > > > > > > > > > > > > > > > > > > Hi Kevin, > > > > > > > > > > > > In the (built-in) Conflict Solver you should (by default) see > > > > three > > > > > > files > > > > > > right beside each other. At least the center file content > > > > should be > > > > > > editable > > > > > > if the file on your disk is editable. > > > > > > > > > > > > -- > > > > > > Best regards, > > > > > > Thomas Singer > > > > > > ============= > > > > > > syntevo GmbH > > > > > > http://www.syntevo.com > > > > > > > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > > > > > > > I just started evaluating SmartSVN, primarily for its merge > > > > feature. > > > > > > > Unfortunately, the Conflict Solver doesn't allow me to > > resolve > > > > > > any of > > > > > > > the conflicts. The files display but there's no way to edit > > > > > > > anything. Can someone tell me what I'm missing? > > > > > > > > > > > > > > Kevin N. Emslie Sarsen > > > > > > > kevinsarsen@... > > > > > > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > > > > > > > > > > > > > ------------------------------------ > > > > > > > > > > Yahoo! Groups Links > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > > > > > ------------------------------------ > > > > > > Yahoo! Groups Links > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > ------------------------------------ > > Yahoo! Groups Links > > > > ------------------------------------ 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/ |
|
|
Re: Evaluating on Mac -- Problems with Conflict Solver
by Kevin N. Emslie Sarsen
::
Rate this Message:
Thank you! I performed a merge and was able to address the conflicts
at that point. On Jun 30, 2009, at 12:59 PM, syntevo Support wrote: > > > > So, at what point can I solve conflicts prior to a merge? > > This is not possible. But SVN/SmartSVN will keep all important files > (especially your modified working copy) in case of a conflict, so > it will be > no problem to solve/revert once it has occurred. > > -- > Best regards, > Marc Strapetz > _____________ > syntevo GmbH > www.syntevo.com > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > Ah.... > > > > So, at what point can I solve conflicts prior to a merge? > > > > Kevin N. Emslie Sarsen > > kevinsarsen@... > > > > > > > > > > On Jun 30, 2009, at 2:10 AM, syntevo Support wrote: > > > > > > > > > > > > 4) Click on preview > > > > 5) Double-click on a file showing a conflict to open it with > > > Conflict > > > > Solver > > > > > > For the Merge Preview, the conflict solver should actually be > read- > > > only, as it > > > makes no sense to modify files here. That's already the case for > > > the built-in > > > conflict solver. For 6.0.3 also the temporary files will be set to > > > read-only > > > so external tools will not allow to edit these files. > > > > > > -- > > > Best regards, > > > Marc Strapetz > > > _____________ > > > syntevo GmbH > > > www.syntevo.com > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > Thomas, > > > > > > > > The svn:needs-lock property is not set. I checked permissions > as you > > > > suggested and owner (me) had read and write, group and all > had read > > > > only. Just for fun, I reset the permissions (chmod 777), but > that > > > > had no effect. > > > > > > > > Here's my sequence of actions that results in this behavior: > > > > 1) Open my project > > > > 2) From the Modify menu I select Merge > > > > 3) Select to Merge from branch, then select a range of > revisions to > > > > merge > > > >  > > > > 4) Click on preview > > > > 5) Double-click on a file showing a conflict to open it with > > > Conflict > > > > Solver > > > >  > > > > > > > > > > > > Kevin N. Emslie Sarsen > > > > kevinsarsen@... > > > > > > > > > > > > > > > > > > > > On Jun 29, 2009, at 4:08 AM, syntevo Support wrote: > > > > > > > > > > > > > > > > > > > Hi Kevin, > > > > > > > > > > I can't reproduce your described behaviour on our OS X 10.5.7 > > > > > system (although > > > > > this OS X difference should not matter). What file > permissions the > > > > > file in > > > > > question has ("ls -al")? Is the svn:needs-lock property set > for > > > the > > > > > file? > > > > > > > > > > -- > > > > > Best regards, > > > > > Thomas Singer > > > > > ============= > > > > > syntevo GmbH > > > > > http://www.syntevo.com > > > > > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> wrote: > > > > > > > > > > > Thanks for the reply, Tom. That's what I thought. > Unfortunately, > > > > > > that's not the behavior I'm seeing. If I use an external > merge > > > > > > application (DiffMerge) it works (I can edit the center > file) as > > > > > > expected but the built-in Conflict Solver won't allow me > to edit > > > > > > anything. I've verified that the file is editable so am > quite > > > > > > confused. I'd prefer to use the built-in Conflict Solver if > > > at all > > > > > > possible, so any help would be appreciated. > > > > > > > > > > > > I'm running a MacBook Pro with OS X 10.4.11, if that's > any help. > > > > > > > > > > > > Kevin N. Emslie Sarsen > > > > > > kevinsarsen@... > > > > > > > > > > > > > > > > > > > > > > > > On Jun 25, 2009, at 2:19 AM, syntevo Support wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > Hi Kevin, > > > > > > > > > > > > > > In the (built-in) Conflict Solver you should (by > default) see > > > > > three > > > > > > > files > > > > > > > right beside each other. At least the center file content > > > > > should be > > > > > > > editable > > > > > > > if the file on your disk is editable. > > > > > > > > > > > > > > -- > > > > > > > Best regards, > > > > > > > Thomas Singer > > > > > > > ============= > > > > > > > syntevo GmbH > > > > > > > http://www.syntevo.com > > > > > > > > > > > > > > "Kevin N. Emslie Sarsen" <kevinsarsen@...> > wrote: > > > > > > > > > > > > > > > I just started evaluating SmartSVN, primarily for its > merge > > > > > feature. > > > > > > > > Unfortunately, the Conflict Solver doesn't allow me to > > > resolve > > > > > > > any of > > > > > > > > the conflicts. The files display but there's no way > to edit > > > > > > > > anything. Can someone tell me what I'm missing? > > > > > > > > > > > > > > > > Kevin N. Emslie Sarsen > > > > > > > > kevinsarsen@... > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > > > > > > > > > > > > > > > > > ------------------------------------ > > > > > > > > > > > > Yahoo! Groups Links > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > > > > > > > > > ------------------------------------ > > > > > > > > Yahoo! Groups Links > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > [Non-text portions of this message have been removed] > > > > > > > > ------------------------------------ > > > > Yahoo! Groups Links > > > > > > > > > > [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/ |
| Free embeddable forum powered by Nabble | Forum Help |
