airavata-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Subho Banerjee <subs.z...@gmail.com>
Subject Re: [GSoC] SVN Patches
Date Thu, 08 Aug 2013 22:25:09 GMT
Hi,
I think this has to done on a file to file basis. As far as what I
understood from Shameera in the hangout, it cannot be done with the patches.



On Thu, Aug 8, 2013 at 8:05 AM, Suresh Marru <smarru@iu.edu> wrote:

> Subho,
>
> You were intending to work with Shameera and figure this out. How did it
> go? are you still having issues?
>
> Suresh
>
> On Aug 1, 2013, at 12:02 AM, Subho Banerjee <subs.zero@gmail.com> wrote:
>
> > That is precisely my problem, though these files are added in my local
> SVN repository's list of changes with an "svn add", "svm mv" or "svn rm"
> command. And the patches are generated accordingly, these files are not
> getting committed into the central repository.
> >
> >
> > On Thu, Aug 1, 2013 at 7:42 AM, Suresh Marru <smarru@iu.edu> wrote:
> > Hi Subho,
> >
> > Your svn status indicated there are some uncommitted files in your local
> copy. You may find this link useful to interpret the status output -
> http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.status.html
> >
> > I am getting slowly inclined to recommend GIT so we can have better
> merge capabilities. The only downside is ASF works on CTR (Committ then
> Review) model and I have seen GIT slowly gives developers work longer
> without committing to master and in the end submit a large pull requests
> which goes unreviewed.
> >
> > Suresh
> >
> > On Jul 31, 2013, at 10:56 AM, Subho Banerjee <subs.zero@gmail.com>
> wrote:
> >
> > > Hello Suresh,
> > > I still see that after you have applied my latest patch from JIRA,
> some of the image files (app/img/grid.gif) that for example have not been
> added to the repository. If I run "svn up" and "svn st", this is what I get
> --
> > >
> > > gsoc2013|=> svn up
> > > Updating '.':
> > > At revision 1508892.
> > > gsoc2013|=> svn st
> > > M       app/favicon.ico
> > > A  +    app/img
> > > A       app/img/grid.gif
> > > R  +    app/scripts/controllers/executionInterfaceCntl.js
> > > R  +    app/scripts/model
> > > D       doc
> > > D       img
> > > R  +    package.json
> > > gsoc2013|=>
> > >
> > > So both the image files favicon.ico and grid.gif have not been updated
> to the latest version. Also, some of the folders were moved with the svn mv
> command, these are showing up with the + symbol as the history of the mv
> have not been inherited by the new file.
> > >
> > > Are there some special flags which have to be given to produce the
> correct patch file? I am currently using "svn diff --force
> --notice-ancestry --show-copies-as-adds > fixConflictsAddBandit.patch"
> > >
> > > Cheers,
> > > Subho
> > >
> > >
> > > On Tue, Jul 30, 2013 at 5:40 AM, Suresh Marru <smarru@iu.edu> wrote:
> > > Hi Subho,
> > >
> > > I assume you figured this out right? in your latest patch I have
> noticed binary files.
> > >
> > > Suresh
> > > On Jul 23, 2013, at 5:52 AM, Subho Banerjee <subs.zero@gmail.com>
> wrote:
> > >
> > > > Hi devs,
> > > > I am having a problem of sending in a patch which contains a binary
> file.
> > > >
> > > > Since the current SVN patch system allows for transmission of files
> which are UTF-8 compliant, I cannot add images/fonts, UTF16 configuration
> files etc. in the patch that I am sending. As a result, things are not
> working as they should.
> > > >
> > > > I snooped around online for a solution to this problem, and found
> that it is not straight forward[1][2][3]. Do you have any idea how I can
> send you a patch to do this?
> > > >
> > > >
> > > > Cheers,
> > > > Subho
> > > >
> > > >
> > > > [1]
> http://subversion.1072662.n5.nabble.com/Create-Apply-Patch-UTF-16-and-binary-support-td181079.html
> > > > [2]http://subversion.tigris.org/issues/show_bug.cgi?id=2194
> > > > [3]http://svn.haxx.se/tsvnusers/archive-2011-05/0012.shtml
> > >
> > >
> > >
> > >
> > > --
> > > Cheers,
> > > Subho
> >
> >
> >
> >
> > --
> > Cheers,
> > Subho
>
>


-- 
Cheers,
Subho

Mime
View raw message