no prob. It will be settled down after some time.
On 11/28/2013 09:39 AM, PCMan wrote:
> Really sorry about that.
> It seems to be caused by our prior auto-sync from sf.net
> <http://sf.net> repos to github.
> I also noticed this issue previously.
> Currently, the repo menu-cache, libfm, pcmanfm-qt, and lxsesion, which
> are from the old lxde projects are automatically kept in sync with the
> original repos on sf.net <http://sf.net> by some facilities set up by
> Martin previously.
> The sync seems to be unidirectional and changes in github clones don't
> get into the sf.net <http://sf.net> repos.
> Your fixes needs to be pushed into the sf.net <http://sf.net> repos
> instead of the github clones for the old lxde components.
> So, the only way to solve this issue is moving from old git hosting to
> our own git.lxde.org <http://git.lxde.org> as soon as possible.
> We're in the middle of the migration to our own hosting.
> Martin is also working on migrating the old mailing list to the new
> lists.lxde.org <http://lists.lxde.org> server.
> After finishing them, we can use the same git hosting + mailing list.
> Now, it's really the time to fix the hosting issue.
>
> On Thu, Nov 28, 2013 at 4:28 PM, Petr Vanek <p...@yarpen.cz
> <mailto:p...@yarpen.cz>> wrote:
>
> hi all,
>
> I'm starting to be confused more and more. I merged a pull request 2
> days ago:
> https://github.com/lxde/pcmanfm-qt/pull/12
>
> I don't see it in commit timeline. And mainly - I'm not able to
> pull the
> submodule anymore:
>
> Entering 'pcmanfm-qt'
> First, rewinding head to replay your work on top of it...
> Applying: Add LIB_SUFFIX for library destination
> Using index info to reconstruct a base tree...
> M libfm-qt/CMakeLists.txt
> Falling back to patching base and 3-way merge...
> Auto-merging libfm-qt/CMakeLists.txt
> CONFLICT (content): Merge conflict in libfm-qt/CMakeLists.txt
> Failed to merge in the changes.
> Patch failed at 0001 Add LIB_SUFFIX for library destination
> The copy of the patch that failed is found in:
>
>
> /export/home/pvanek/oss/lxqt/lxde-qt/.git/modules/pcmanfm-qt/rebase-apply/patch
>
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase
> --abort".
>
> Stopping at 'pcmanfm-qt'; script returned non-zero status.
>
> As I said many times before - I'm not git expert, just a
> "pull/commit/push" user but it's quite strange...
> (my pain from split repositories growth day by day ;))
>
> any clue?
> thanks,
> p.
>
>
>
> ------------------------------------------------------------------------------
> Rapidly troubleshoot problems before they affect your business.
> Most IT
> organizations don't have a clear picture of how application
> performance
> affects their revenue. With AppDynamics, you get 100% visibility
> into your
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of
> AppDynamics Pro!
>
> http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
> _______________________________________________
> Lxde-list mailing list
> Lxde-list@lists.sourceforge.net
> <mailto:Lxde-list@lists.sourceforge.net>
> https://lists.sourceforge.net/lists/listinfo/lxde-list
>
>
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Lxde-list mailing list
Lxde-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxde-list
