This seems to have fixed the specific issue I reported. We'll keep an eye out for any other issues with the 7xx links.


On Fri, Jul 26, 2013 at 7:47 AM, Demian Katz <demian.katz@villanova.edu> wrote:
It sounds like you are doing things correctly, so I'm not totally sure what's wrong.

You can pull/push between local git repos on your file system.  What happens if you create a new copy of your untouched repo, pull one of your project branches into it from your other repo, and then try to merge the untouched master into the project branch?

- Demian
________________________________________
From: Osullivan L. [L.Osullivan@swansea.ac.uk]
Sent: Friday, July 26, 2013 8:41 AM
To: 'vufind-tech@lists.sourceforge.net'
Subject: [VuFind-Tech] Git Updating

Hi Folks,

I'm having a problem upgrading VuFind using Git on eclipse.

I have two checkouts of the VuFind Master Branch, one which is untouched
and one where I have lots of branches for various projects.

The untouched version appears to update fine using pull and I though the
development one was working fine too as the message I receive after pull
is the same. I then merge the origin/master into all my branches and
that completes with no problems. When I compare my development branches
with the untouched version however, lots of files are missing or haven't
been removed. I suspect none of them have been updated correctly either.

Am I missing a step? It's odd because if I checkout the master/origin on
both instances and compare them, they are different despite the revision
numbers being the same.

Thanks,

Luke
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Vufind-tech mailing list
Vufind-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vufind-tech

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Vufind-tech mailing list
Vufind-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vufind-tech