Fetch Failure

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Fetch Failure

waltw87
Hi again :)  Sorry about all the reports...  But I've gotten into a situation where I can't fetch.  Here's the log:

101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO            sg.command  - Fetch [Directory /] / (merge=true;commit=true;updateSubmodules=true)
101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO  smartgit.ssh.injector  - creating file 'C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp\ssh.3381208587085894882.cmd' with following content: @echo off
"c:\program files (x86)\smartgit 1\jre\bin\java.exe" "-cp" "C:\Program Files (x86)\SmartGit 1\lib\log4j.jar;C:\Program Files (x86)\SmartGit 1\lib\smartgit.jar;C:\Program Files (x86)\SmartGit 1\lib\trilead.jar" "-Dsmartgit.tempDir=C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp" "-Dsmartgit.id=5157661374598028452" "-Dsmartgit.port=4332" "com.syntevo.smartgit.ssh.SshMain" %*
101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO  smartgit.core.executable  - Executing following command: C:\Program Files (x86)\Git\bin\git.exe pull LameGameServ
101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO  smartgit.core.executable  -  in directory: C:\Walt\Programming\Scaled Concepts
102331 (2009-10-29 17:50:40,904) [Thread-16] INFO       smartsvn.server  - received command: ssh
102332 (2009-10-29 17:50:40,905) [Thread-16] INFO   smartgit.ssh.client  - Connecting to lamegame.no-ip.org:22112
102888 (2009-10-29 17:50:41,461) [Thread-16] INFO  smartgit.ssh.client.ui  - connected to server version SSH-2.0-OpenSSH_5.1p1 Debian-5
103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  - Authentication methods:
103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -  password
103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -  publickey
103984 (2009-10-29 17:50:42,557) [Thread-10] INFO  smartgit.command.logging  - stderr: You asked me to pull without telling me which branch you
103985 (2009-10-29 17:50:42,558) [Thread-10] INFO  smartgit.command.logging  - stderr: want to merge with, and 'branch.domain-test.merge' in
103989 (2009-10-29 17:50:42,562) [Thread-10] INFO  smartgit.command.logging  - stderr: your configuration file does not tell me either. Please
103992 (2009-10-29 17:50:42,565) [Thread-10] INFO  smartgit.command.logging  - stderr: specify which branch you want to merge on the command line and
103996 (2009-10-29 17:50:42,569) [Thread-10] INFO  smartgit.command.logging  - stderr: try again (e.g. 'git pull <repository> <refspec>').
103999 (2009-10-29 17:50:42,572) [Thread-10] INFO  smartgit.command.logging  - stderr: See git-pull(1) for details.
104002 (2009-10-29 17:50:42,575) [Thread-10] INFO  smartgit.command.logging  - stderr: If you often merge with the same branch, you may want to
104005 (2009-10-29 17:50:42,578) [Thread-10] INFO  smartgit.command.logging  - stderr: configure the following variables in your configuration
104008 (2009-10-29 17:50:42,581) [Thread-10] INFO  smartgit.command.logging  - stderr: file:
104011 (2009-10-29 17:50:42,584) [Thread-10] INFO  smartgit.command.logging  - stderr:     branch.domain-test.remote = <nickname>
104014 (2009-10-29 17:50:42,587) [Thread-10] INFO  smartgit.command.logging  - stderr:     branch.domain-test.merge = <remote-ref>
104018 (2009-10-29 17:50:42,591) [Thread-10] INFO  smartgit.command.logging  - stderr:     remote.<nickname>.url = <url>
104020 (2009-10-29 17:50:42,593) [Thread-10] INFO  smartgit.command.logging  - stderr:     remote.<nickname>.fetch = <refspec>
104023 (2009-10-29 17:50:42,596) [Thread-10] INFO  smartgit.command.logging  - stderr: See git-config(1) for details.
104031 (2009-10-29 17:50:42,604) [WorkerThread-1] ERROR           sg.command  - Merging the remote changes failed with conflicts.
smartgit.ry: Merging the remote changes failed with conflicts.
        at smartgit.JF.a(SourceFile:47)
        at smartgit.iR.a(SourceFile:68)
        at smartgit.Oy.a(SourceFile:30)
        at smartgit.Xi.a(SourceFile:42)
        at smartgit.AK.a(SourceFile:39)
        at smartgit.cW.a(SourceFile:50)
        at smartgit.So.a_(SourceFile:78)
        at smartgit.Nv.a(SourceFile:36)
        at smartgit.CH.run(SourceFile:26)
        at smartgit.qt.run(SourceFile:52)
104031 (2009-10-29 17:50:42,604) [WorkerThread-1] WARN             q.dialogs  - Show: Git operation failed - Executing Git operation has failed:

I'm working in a non-master branch, perhaps that's it?  If I Fetch on master it seems to work.

Reply | Threaded
Open this post in threaded view
|

Re: Fetch Failure

syntevo Support
> Hi again :)  Sorry about all the reports...  But I've gotten into a
> situation where I can't fetch.  Here's the log:

In which state is the repository left after the fetch? From the log, it looks
like you got conflicts (so the pure fetch-part succeeded). Fetch will only
merge the remote changes for your current branch. So probably there have been
conflicting changes in your non-master branch, but no conflicting changes in
the master?

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com



"waltw87" <[hidden email]> wrote:

> Hi again :)  Sorry about all the reports...  But I've gotten into a situation
> where I can't fetch.  Here's the log:
>
> 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO            sg.command
> - Fetch [Directory /] / (merge=true;commit=true;updateSubmodules=true)
> 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO  smartgit.ssh.injector
> - creating file
> 'C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp\ssh.3381208587085894882.cmd'
> with following content: @echo off
> "c:\program files (x86)\smartgit 1\jre\bin\java.exe" "-cp" "C:\Program Files
> (x86)\SmartGit 1\lib\log4j.jar;C:\Program Files (x86)\SmartGit
> 1\lib\smartgit.jar;C:\Program Files (x86)\SmartGit 1\lib\trilead.jar"
> "-Dsmartgit.tempDir=C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp"
> "-Dsmartgit.id=5157661374598028452" "-Dsmartgit.port=4332"
> "com.syntevo.smartgit.ssh.SshMain" %*
> 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> smartgit.core.executable  - Executing following command: C:\Program Files
> (x86)\Git\bin\git.exe pull LameGameServ
> 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> smartgit.core.executable  -  in directory: C:\Walt\Programming\Scaled Concepts
> 102331 (2009-10-29 17:50:40,904) [Thread-16] INFO       smartsvn.server  -
> received command: ssh
> 102332 (2009-10-29 17:50:40,905) [Thread-16] INFO   smartgit.ssh.client  -
> Connecting to lamegame.no-ip.org:22112
> 102888 (2009-10-29 17:50:41,461) [Thread-16] INFO  smartgit.ssh.client.ui  -
> connected to server version SSH-2.0-OpenSSH_5.1p1 Debian-5
> 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> Authentication methods:
> 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> password
> 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> publickey
> 103984 (2009-10-29 17:50:42,557) [Thread-10] INFO  smartgit.command.logging  -
> stderr: You asked me to pull without telling me which branch you
> 103985 (2009-10-29 17:50:42,558) [Thread-10] INFO  smartgit.command.logging  -
> stderr: want to merge with, and 'branch.domain-test.merge' in
> 103989 (2009-10-29 17:50:42,562) [Thread-10] INFO  smartgit.command.logging  -
> stderr: your configuration file does not tell me either. Please
> 103992 (2009-10-29 17:50:42,565) [Thread-10] INFO  smartgit.command.logging  -
> stderr: specify which branch you want to merge on the command line and
> 103996 (2009-10-29 17:50:42,569) [Thread-10] INFO  smartgit.command.logging  -
> stderr: try again (e.g. 'git pull <repository> <refspec>').
> 103999 (2009-10-29 17:50:42,572) [Thread-10] INFO  smartgit.command.logging  -
> stderr: See git-pull(1) for details.
> 104002 (2009-10-29 17:50:42,575) [Thread-10] INFO  smartgit.command.logging  -
> stderr: If you often merge with the same branch, you may want to
> 104005 (2009-10-29 17:50:42,578) [Thread-10] INFO  smartgit.command.logging  -
> stderr: configure the following variables in your configuration
> 104008 (2009-10-29 17:50:42,581) [Thread-10] INFO  smartgit.command.logging  -
> stderr: file:
> 104011 (2009-10-29 17:50:42,584) [Thread-10] INFO  smartgit.command.logging  -
> stderr:     branch.domain-test.remote = <nickname>
> 104014 (2009-10-29 17:50:42,587) [Thread-10] INFO  smartgit.command.logging  -
> stderr:     branch.domain-test.merge = <remote-ref>
> 104018 (2009-10-29 17:50:42,591) [Thread-10] INFO  smartgit.command.logging  -
> stderr:     remote.<nickname>.url = <url>
> 104020 (2009-10-29 17:50:42,593) [Thread-10] INFO  smartgit.command.logging  -
> stderr:     remote.<nickname>.fetch = <refspec>
> 104023 (2009-10-29 17:50:42,596) [Thread-10] INFO  smartgit.command.logging  -
> stderr: See git-config(1) for details.
> 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] ERROR           sg.command
> - Merging the remote changes failed with conflicts.
> smartgit.ry: Merging the remote changes failed with conflicts.
>  at smartgit.JF.a(SourceFile:47)
>  at smartgit.iR.a(SourceFile:68)
>  at smartgit.Oy.a(SourceFile:30)
>  at smartgit.Xi.a(SourceFile:42)
>  at smartgit.AK.a(SourceFile:39)
>  at smartgit.cW.a(SourceFile:50)
>  at smartgit.So.a_(SourceFile:78)
>  at smartgit.Nv.a(SourceFile:36)
>  at smartgit.CH.run(SourceFile:26)
>  at smartgit.qt.run(SourceFile:52)
> 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] WARN             q.dialogs
> - Show: Git operation failed - Executing Git operation has failed:
>
> I'm working in a non-master branch, perhaps that's it?  If I Fetch on master
> it seems to work.
>
>






Reply | Threaded
Open this post in threaded view
|

Re: Fetch Failure

waltw87
Maybe . . . my active branch was non-master.  Perhaps it does mean there were conflicts in master but not elsewhere -- I ended up updating through the Git GUI though, and that worked fine.

There was a new branch on the server though -- maybe that had something to do with it?

-Walt

--- In [hidden email], syntevo Support <smartgit@...> wrote:

>
> > Hi again :)  Sorry about all the reports...  But I've gotten into a
> > situation where I can't fetch.  Here's the log:
>
> In which state is the repository left after the fetch? From the log, it looks
> like you got conflicts (so the pure fetch-part succeeded). Fetch will only
> merge the remote changes for your current branch. So probably there have been
> conflicting changes in your non-master branch, but no conflicting changes in
> the master?
>
> --
> Best regards,
> Marc Strapetz
> =============
> syntevo GmbH
> http://www.syntevo.com
> http://blog.syntevo.com
>
>
>
> "waltw87" <waltw87@...> wrote:
>
> > Hi again :)  Sorry about all the reports...  But I've gotten into a situation
> > where I can't fetch.  Here's the log:
> >
> > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO            sg.command
> > - Fetch [Directory /] / (merge=true;commit=true;updateSubmodules=true)
> > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO  smartgit.ssh.injector
> > - creating file
> > 'C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp\ssh.3381208587085894882.cmd'
> > with following content: @echo off
> > "c:\program files (x86)\smartgit 1\jre\bin\java.exe" "-cp" "C:\Program Files
> > (x86)\SmartGit 1\lib\log4j.jar;C:\Program Files (x86)\SmartGit
> > 1\lib\smartgit.jar;C:\Program Files (x86)\SmartGit 1\lib\trilead.jar"
> > "-Dsmartgit.tempDir=C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp"
> > "-Dsmartgit.id=5157661374598028452" "-Dsmartgit.port=4332"
> > "com.syntevo.smartgit.ssh.SshMain" %*
> > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > smartgit.core.executable  - Executing following command: C:\Program Files
> > (x86)\Git\bin\git.exe pull LameGameServ
> > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > smartgit.core.executable  -  in directory: C:\Walt\Programming\Scaled Concepts
> > 102331 (2009-10-29 17:50:40,904) [Thread-16] INFO       smartsvn.server  -
> > received command: ssh
> > 102332 (2009-10-29 17:50:40,905) [Thread-16] INFO   smartgit.ssh.client  -
> > Connecting to lamegame.no-ip.org:22112
> > 102888 (2009-10-29 17:50:41,461) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > connected to server version SSH-2.0-OpenSSH_5.1p1 Debian-5
> > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > Authentication methods:
> > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > password
> > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > publickey
> > 103984 (2009-10-29 17:50:42,557) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: You asked me to pull without telling me which branch you
> > 103985 (2009-10-29 17:50:42,558) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: want to merge with, and 'branch.domain-test.merge' in
> > 103989 (2009-10-29 17:50:42,562) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: your configuration file does not tell me either. Please
> > 103992 (2009-10-29 17:50:42,565) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: specify which branch you want to merge on the command line and
> > 103996 (2009-10-29 17:50:42,569) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: try again (e.g. 'git pull <repository> <refspec>').
> > 103999 (2009-10-29 17:50:42,572) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: See git-pull(1) for details.
> > 104002 (2009-10-29 17:50:42,575) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: If you often merge with the same branch, you may want to
> > 104005 (2009-10-29 17:50:42,578) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: configure the following variables in your configuration
> > 104008 (2009-10-29 17:50:42,581) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: file:
> > 104011 (2009-10-29 17:50:42,584) [Thread-10] INFO  smartgit.command.logging  -
> > stderr:     branch.domain-test.remote = <nickname>
> > 104014 (2009-10-29 17:50:42,587) [Thread-10] INFO  smartgit.command.logging  -
> > stderr:     branch.domain-test.merge = <remote-ref>
> > 104018 (2009-10-29 17:50:42,591) [Thread-10] INFO  smartgit.command.logging  -
> > stderr:     remote.<nickname>.url = <url>
> > 104020 (2009-10-29 17:50:42,593) [Thread-10] INFO  smartgit.command.logging  -
> > stderr:     remote.<nickname>.fetch = <refspec>
> > 104023 (2009-10-29 17:50:42,596) [Thread-10] INFO  smartgit.command.logging  -
> > stderr: See git-config(1) for details.
> > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] ERROR           sg.command
> > - Merging the remote changes failed with conflicts.
> > smartgit.ry: Merging the remote changes failed with conflicts.
> >  at smartgit.JF.a(SourceFile:47)
> >  at smartgit.iR.a(SourceFile:68)
> >  at smartgit.Oy.a(SourceFile:30)
> >  at smartgit.Xi.a(SourceFile:42)
> >  at smartgit.AK.a(SourceFile:39)
> >  at smartgit.cW.a(SourceFile:50)
> >  at smartgit.So.a_(SourceFile:78)
> >  at smartgit.Nv.a(SourceFile:36)
> >  at smartgit.CH.run(SourceFile:26)
> >  at smartgit.qt.run(SourceFile:52)
> > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] WARN             q.dialogs
> > - Show: Git operation failed - Executing Git operation has failed:
> >
> > I'm working in a non-master branch, perhaps that's it?  If I Fetch on master
> > it seems to work.
> >
> >
>


Reply | Threaded
Open this post in threaded view
|

Re: Fetch Failure

waltw87
Ah, I know what the problem was - I had deleted the branch I was trying to fetch from the server, but not locally.  Would it be reasonable to provide a more direct error message?

--- In [hidden email], "waltw87" <waltw87@...> wrote:

>
> Maybe . . . my active branch was non-master.  Perhaps it does mean there were conflicts in master but not elsewhere -- I ended up updating through the Git GUI though, and that worked fine.
>
> There was a new branch on the server though -- maybe that had something to do with it?
>
> -Walt
>
> --- In [hidden email], syntevo Support <smartgit@> wrote:
> >
> > > Hi again :)  Sorry about all the reports...  But I've gotten into a
> > > situation where I can't fetch.  Here's the log:
> >
> > In which state is the repository left after the fetch? From the log, it looks
> > like you got conflicts (so the pure fetch-part succeeded). Fetch will only
> > merge the remote changes for your current branch. So probably there have been
> > conflicting changes in your non-master branch, but no conflicting changes in
> > the master?
> >
> > --
> > Best regards,
> > Marc Strapetz
> > =============
> > syntevo GmbH
> > http://www.syntevo.com
> > http://blog.syntevo.com
> >
> >
> >
> > "waltw87" <waltw87@> wrote:
> >
> > > Hi again :)  Sorry about all the reports...  But I've gotten into a situation
> > > where I can't fetch.  Here's the log:
> > >
> > > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO            sg.command
> > > - Fetch [Directory /] / (merge=true;commit=true;updateSubmodules=true)
> > > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO  smartgit.ssh.injector
> > > - creating file
> > > 'C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp\ssh.3381208587085894882.cmd'
> > > with following content: @echo off
> > > "c:\program files (x86)\smartgit 1\jre\bin\java.exe" "-cp" "C:\Program Files
> > > (x86)\SmartGit 1\lib\log4j.jar;C:\Program Files (x86)\SmartGit
> > > 1\lib\smartgit.jar;C:\Program Files (x86)\SmartGit 1\lib\trilead.jar"
> > > "-Dsmartgit.tempDir=C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp"
> > > "-Dsmartgit.id=5157661374598028452" "-Dsmartgit.port=4332"
> > > "com.syntevo.smartgit.ssh.SshMain" %*
> > > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > > smartgit.core.executable  - Executing following command: C:\Program Files
> > > (x86)\Git\bin\git.exe pull LameGameServ
> > > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > > smartgit.core.executable  -  in directory: C:\Walt\Programming\Scaled Concepts
> > > 102331 (2009-10-29 17:50:40,904) [Thread-16] INFO       smartsvn.server  -
> > > received command: ssh
> > > 102332 (2009-10-29 17:50:40,905) [Thread-16] INFO   smartgit.ssh.client  -
> > > Connecting to lamegame.no-ip.org:22112
> > > 102888 (2009-10-29 17:50:41,461) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > connected to server version SSH-2.0-OpenSSH_5.1p1 Debian-5
> > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > Authentication methods:
> > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > password
> > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > publickey
> > > 103984 (2009-10-29 17:50:42,557) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: You asked me to pull without telling me which branch you
> > > 103985 (2009-10-29 17:50:42,558) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: want to merge with, and 'branch.domain-test.merge' in
> > > 103989 (2009-10-29 17:50:42,562) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: your configuration file does not tell me either. Please
> > > 103992 (2009-10-29 17:50:42,565) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: specify which branch you want to merge on the command line and
> > > 103996 (2009-10-29 17:50:42,569) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: try again (e.g. 'git pull <repository> <refspec>').
> > > 103999 (2009-10-29 17:50:42,572) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: See git-pull(1) for details.
> > > 104002 (2009-10-29 17:50:42,575) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: If you often merge with the same branch, you may want to
> > > 104005 (2009-10-29 17:50:42,578) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: configure the following variables in your configuration
> > > 104008 (2009-10-29 17:50:42,581) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: file:
> > > 104011 (2009-10-29 17:50:42,584) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr:     branch.domain-test.remote = <nickname>
> > > 104014 (2009-10-29 17:50:42,587) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr:     branch.domain-test.merge = <remote-ref>
> > > 104018 (2009-10-29 17:50:42,591) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr:     remote.<nickname>.url = <url>
> > > 104020 (2009-10-29 17:50:42,593) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr:     remote.<nickname>.fetch = <refspec>
> > > 104023 (2009-10-29 17:50:42,596) [Thread-10] INFO  smartgit.command.logging  -
> > > stderr: See git-config(1) for details.
> > > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] ERROR           sg.command
> > > - Merging the remote changes failed with conflicts.
> > > smartgit.ry: Merging the remote changes failed with conflicts.
> > >  at smartgit.JF.a(SourceFile:47)
> > >  at smartgit.iR.a(SourceFile:68)
> > >  at smartgit.Oy.a(SourceFile:30)
> > >  at smartgit.Xi.a(SourceFile:42)
> > >  at smartgit.AK.a(SourceFile:39)
> > >  at smartgit.cW.a(SourceFile:50)
> > >  at smartgit.So.a_(SourceFile:78)
> > >  at smartgit.Nv.a(SourceFile:36)
> > >  at smartgit.CH.run(SourceFile:26)
> > >  at smartgit.qt.run(SourceFile:52)
> > > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] WARN             q.dialogs
> > > - Show: Git operation failed - Executing Git operation has failed:
> > >
> > > I'm working in a non-master branch, perhaps that's it?  If I Fetch on master
> > > it seems to work.
> > >
> > >
> >
>


Reply | Threaded
Open this post in threaded view
|

Re: Re: Fetch Failure

syntevo Support
> Ah, I know what the problem was - I had deleted the branch I was trying to
> fetch from the server, but not locally.  Would it be reasonable to provide a
> more direct error message?

I have tried this now with Git 1.6.5.1 and SmartGit prints out following
warning to the Output log:

"Fetch, merge and commit: Merging the remote changes failed with conflicts.
Your configuration specifies to merge the ref 'xyz' from the remote, but no
such ref was fetched."

Maybe warning message has already been improved for Git itself?

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com



"waltw87" <[hidden email]> wrote:

> Ah, I know what the problem was - I had deleted the branch I was trying to
> fetch from the server, but not locally.  Would it be reasonable to provide a
> more direct error message?
>
> --- In [hidden email], "waltw87" <waltw87@...> wrote:
> >
> > Maybe . . . my active branch was non-master.  Perhaps it does mean there were conflicts in master but not elsewhere -- I ended up updating through the Git GUI though, and that worked fine.
> >
> > There was a new branch on the server though -- maybe that had something to do with it?
> >
> > -Walt
> >
> > --- In [hidden email], syntevo Support <smartgit@> wrote:
> > >
> > > > Hi again :)  Sorry about all the reports...  But I've gotten into a
> > > > situation where I can't fetch.  Here's the log:
> > >
> > > In which state is the repository left after the fetch? From the log, it looks
> > > like you got conflicts (so the pure fetch-part succeeded). Fetch will only
> > > merge the remote changes for your current branch. So probably there have been
> > > conflicting changes in your non-master branch, but no conflicting changes in
> > > the master?
> > >
> > > --
> > > Best regards,
> > > Marc Strapetz
> > > =============
> > > syntevo GmbH
> > > http://www.syntevo.com
> > > http://blog.syntevo.com
> > >
> > >
> > >
> > > "waltw87" <waltw87@> wrote:
> > >
> > > > Hi again :)  Sorry about all the reports...  But I've gotten into a situation
> > > > where I can't fetch.  Here's the log:
> > > >
> > > > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO            sg.command
> > > > - Fetch [Directory /] / (merge=true;commit=true;updateSubmodules=true)
> > > > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO  smartgit.ssh.injector
> > > > - creating file
> > > > 'C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp\ssh.3381208587085894882.cmd'
> > > > with following content: @echo off
> > > > "c:\program files (x86)\smartgit 1\jre\bin\java.exe" "-cp" "C:\Program Files
> > > > (x86)\SmartGit 1\lib\log4j.jar;C:\Program Files (x86)\SmartGit
> > > > 1\lib\smartgit.jar;C:\Program Files (x86)\SmartGit 1\lib\trilead.jar"
> > > > "-Dsmartgit.tempDir=C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp"
> > > > "-Dsmartgit.id=5157661374598028452" "-Dsmartgit.port=4332"
> > > > "com.syntevo.smartgit.ssh.SshMain" %*
> > > > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > > > smartgit.core.executable  - Executing following command: C:\Program Files
> > > > (x86)\Git\bin\git.exe pull LameGameServ
> > > > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > > > smartgit.core.executable  -  in directory: C:\Walt\Programming\Scaled Concepts
> > > > 102331 (2009-10-29 17:50:40,904) [Thread-16] INFO       smartsvn.server  -
> > > > received command: ssh
> > > > 102332 (2009-10-29 17:50:40,905) [Thread-16] INFO   smartgit.ssh.client  -
> > > > Connecting to lamegame.no-ip.org:22112
> > > > 102888 (2009-10-29 17:50:41,461) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > connected to server version SSH-2.0-OpenSSH_5.1p1 Debian-5
> > > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > Authentication methods:
> > > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > password
> > > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > publickey
> > > > 103984 (2009-10-29 17:50:42,557) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: You asked me to pull without telling me which branch you
> > > > 103985 (2009-10-29 17:50:42,558) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: want to merge with, and 'branch.domain-test.merge' in
> > > > 103989 (2009-10-29 17:50:42,562) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: your configuration file does not tell me either. Please
> > > > 103992 (2009-10-29 17:50:42,565) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: specify which branch you want to merge on the command line and
> > > > 103996 (2009-10-29 17:50:42,569) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: try again (e.g. 'git pull <repository> <refspec>').
> > > > 103999 (2009-10-29 17:50:42,572) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: See git-pull(1) for details.
> > > > 104002 (2009-10-29 17:50:42,575) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: If you often merge with the same branch, you may want to
> > > > 104005 (2009-10-29 17:50:42,578) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: configure the following variables in your configuration
> > > > 104008 (2009-10-29 17:50:42,581) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: file:
> > > > 104011 (2009-10-29 17:50:42,584) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr:     branch.domain-test.remote = <nickname>
> > > > 104014 (2009-10-29 17:50:42,587) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr:     branch.domain-test.merge = <remote-ref>
> > > > 104018 (2009-10-29 17:50:42,591) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr:     remote.<nickname>.url = <url>
> > > > 104020 (2009-10-29 17:50:42,593) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr:     remote.<nickname>.fetch = <refspec>
> > > > 104023 (2009-10-29 17:50:42,596) [Thread-10] INFO  smartgit.command.logging  -
> > > > stderr: See git-config(1) for details.
> > > > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] ERROR           sg.command
> > > > - Merging the remote changes failed with conflicts.
> > > > smartgit.ry: Merging the remote changes failed with conflicts.
> > > >  at smartgit.JF.a(SourceFile:47)
> > > >  at smartgit.iR.a(SourceFile:68)
> > > >  at smartgit.Oy.a(SourceFile:30)
> > > >  at smartgit.Xi.a(SourceFile:42)
> > > >  at smartgit.AK.a(SourceFile:39)
> > > >  at smartgit.cW.a(SourceFile:50)
> > > >  at smartgit.So.a_(SourceFile:78)
> > > >  at smartgit.Nv.a(SourceFile:36)
> > > >  at smartgit.CH.run(SourceFile:26)
> > > >  at smartgit.qt.run(SourceFile:52)
> > > > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] WARN             q.dialogs
> > > > - Show: Git operation failed - Executing Git operation has failed:
> > > >
> > > > I'm working in a non-master branch, perhaps that's it?  If I Fetch on master
> > > > it seems to work.
> > > >
> > > >
> > >
> >
>
>
>






Reply | Threaded
Open this post in threaded view
|

Re: Fetch Failure

waltw87
Seems like it -- I've been using Git 1.6.4.  Well, that was an easy fix ;)  Thanks for all the work so far.

--- In [hidden email], syntevo Support <smartgit@...> wrote:

>
> > Ah, I know what the problem was - I had deleted the branch I was trying to
> > fetch from the server, but not locally.  Would it be reasonable to provide a
> > more direct error message?
>
> I have tried this now with Git 1.6.5.1 and SmartGit prints out following
> warning to the Output log:
>
> "Fetch, merge and commit: Merging the remote changes failed with conflicts.
> Your configuration specifies to merge the ref 'xyz' from the remote, but no
> such ref was fetched."
>
> Maybe warning message has already been improved for Git itself?
>
> --
> Best regards,
> Marc Strapetz
> =============
> syntevo GmbH
> http://www.syntevo.com
> http://blog.syntevo.com
>
>
>
> "waltw87" <waltw87@...> wrote:
>
> > Ah, I know what the problem was - I had deleted the branch I was trying to
> > fetch from the server, but not locally.  Would it be reasonable to provide a
> > more direct error message?
> >
> > --- In [hidden email], "waltw87" <waltw87@> wrote:
> > >
> > > Maybe . . . my active branch was non-master.  Perhaps it does mean there were conflicts in master but not elsewhere -- I ended up updating through the Git GUI though, and that worked fine.
> > >
> > > There was a new branch on the server though -- maybe that had something to do with it?
> > >
> > > -Walt
> > >
> > > --- In [hidden email], syntevo Support <smartgit@> wrote:
> > > >
> > > > > Hi again :)  Sorry about all the reports...  But I've gotten into a
> > > > > situation where I can't fetch.  Here's the log:
> > > >
> > > > In which state is the repository left after the fetch? From the log, it looks
> > > > like you got conflicts (so the pure fetch-part succeeded). Fetch will only
> > > > merge the remote changes for your current branch. So probably there have been
> > > > conflicting changes in your non-master branch, but no conflicting changes in
> > > > the master?
> > > >
> > > > --
> > > > Best regards,
> > > > Marc Strapetz
> > > > =============
> > > > syntevo GmbH
> > > > http://www.syntevo.com
> > > > http://blog.syntevo.com
> > > >
> > > >
> > > >
> > > > "waltw87" <waltw87@> wrote:
> > > >
> > > > > Hi again :)  Sorry about all the reports...  But I've gotten into a situation
> > > > > where I can't fetch.  Here's the log:
> > > > >
> > > > > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO            sg.command
> > > > > - Fetch [Directory /] / (merge=true;commit=true;updateSubmodules=true)
> > > > > 101822 (2009-10-29 17:50:40,395) [WorkerThread-1] INFO  smartgit.ssh.injector
> > > > > - creating file
> > > > > 'C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp\ssh.3381208587085894882.cmd'
> > > > > with following content: @echo off
> > > > > "c:\program files (x86)\smartgit 1\jre\bin\java.exe" "-cp" "C:\Program Files
> > > > > (x86)\SmartGit 1\lib\log4j.jar;C:\Program Files (x86)\SmartGit
> > > > > 1\lib\smartgit.jar;C:\Program Files (x86)\SmartGit 1\lib\trilead.jar"
> > > > > "-Dsmartgit.tempDir=C:\Users\WaltW\AppData\Local\Temp\smartgit1350617124008494004tmp"
> > > > > "-Dsmartgit.id=5157661374598028452" "-Dsmartgit.port=4332"
> > > > > "com.syntevo.smartgit.ssh.SshMain" %*
> > > > > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > > > > smartgit.core.executable  - Executing following command: C:\Program Files
> > > > > (x86)\Git\bin\git.exe pull LameGameServ
> > > > > 101823 (2009-10-29 17:50:40,396) [WorkerThread-1] INFO
> > > > > smartgit.core.executable  -  in directory: C:\Walt\Programming\Scaled Concepts
> > > > > 102331 (2009-10-29 17:50:40,904) [Thread-16] INFO       smartsvn.server  -
> > > > > received command: ssh
> > > > > 102332 (2009-10-29 17:50:40,905) [Thread-16] INFO   smartgit.ssh.client  -
> > > > > Connecting to lamegame.no-ip.org:22112
> > > > > 102888 (2009-10-29 17:50:41,461) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > > connected to server version SSH-2.0-OpenSSH_5.1p1 Debian-5
> > > > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > > Authentication methods:
> > > > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > > password
> > > > > 103392 (2009-10-29 17:50:41,965) [Thread-16] INFO  smartgit.ssh.client.ui  -
> > > > > publickey
> > > > > 103984 (2009-10-29 17:50:42,557) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: You asked me to pull without telling me which branch you
> > > > > 103985 (2009-10-29 17:50:42,558) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: want to merge with, and 'branch.domain-test.merge' in
> > > > > 103989 (2009-10-29 17:50:42,562) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: your configuration file does not tell me either. Please
> > > > > 103992 (2009-10-29 17:50:42,565) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: specify which branch you want to merge on the command line and
> > > > > 103996 (2009-10-29 17:50:42,569) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: try again (e.g. 'git pull <repository> <refspec>').
> > > > > 103999 (2009-10-29 17:50:42,572) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: See git-pull(1) for details.
> > > > > 104002 (2009-10-29 17:50:42,575) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: If you often merge with the same branch, you may want to
> > > > > 104005 (2009-10-29 17:50:42,578) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: configure the following variables in your configuration
> > > > > 104008 (2009-10-29 17:50:42,581) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: file:
> > > > > 104011 (2009-10-29 17:50:42,584) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr:     branch.domain-test.remote = <nickname>
> > > > > 104014 (2009-10-29 17:50:42,587) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr:     branch.domain-test.merge = <remote-ref>
> > > > > 104018 (2009-10-29 17:50:42,591) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr:     remote.<nickname>.url = <url>
> > > > > 104020 (2009-10-29 17:50:42,593) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr:     remote.<nickname>.fetch = <refspec>
> > > > > 104023 (2009-10-29 17:50:42,596) [Thread-10] INFO  smartgit.command.logging  -
> > > > > stderr: See git-config(1) for details.
> > > > > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] ERROR           sg.command
> > > > > - Merging the remote changes failed with conflicts.
> > > > > smartgit.ry: Merging the remote changes failed with conflicts.
> > > > >  at smartgit.JF.a(SourceFile:47)
> > > > >  at smartgit.iR.a(SourceFile:68)
> > > > >  at smartgit.Oy.a(SourceFile:30)
> > > > >  at smartgit.Xi.a(SourceFile:42)
> > > > >  at smartgit.AK.a(SourceFile:39)
> > > > >  at smartgit.cW.a(SourceFile:50)
> > > > >  at smartgit.So.a_(SourceFile:78)
> > > > >  at smartgit.Nv.a(SourceFile:36)
> > > > >  at smartgit.CH.run(SourceFile:26)
> > > > >  at smartgit.qt.run(SourceFile:52)
> > > > > 104031 (2009-10-29 17:50:42,604) [WorkerThread-1] WARN             q.dialogs
> > > > > - Show: Git operation failed - Executing Git operation has failed:
> > > > >
> > > > > I'm working in a non-master branch, perhaps that's it?  If I Fetch on master
> > > > > it seems to work.
> > > > >
> > > > >
> > > >
> > >
> >
> >
> >
>