On Wed, May 23, 2012 at 4:21 PM, Marc Delisle marc@infomarc.info wrote:
Le 2012-05-23 06:44, Thilina Buddika Abeyrathna a écrit :
On Wed, May 23, 2012 at 4:10 PM, Marc Delisle marc@infomarc.info
wrote:
Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit :
On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <
rouslan@placella.com
wrote:
On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote:
On Tue, May 22, 2012 at 12:38 AM, Marc Delislemarc@infomarc.info
wrote:
> Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit : >> On Mon, May 21, 2012 at 10:32 PM, Marc Delislemarc@infomarc.info > wrote: >> >>> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >>>> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<marc@infomarc.info
>>> wrote: >>>> >>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<
marc@infomarc.info
>>>>> wrote: >>>>>> >>>>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>>>> Hi Marc, >>>>>>>> In tbl_replace.php I don't see any usage of $me_fields
variable.
So
>>> I'm >>>>>>>> going to remove the declaration and I'll change the all
variable
>>> names >>>>>>>> $me_* to $multi_edit_*. >>>>>>>> Is it OK? >>>>>>> >>>>>>> Hi Thilina, >>>>>>> If you have access to command-line git, try this: >>>>>>> >>>>>>> git grep '$me_fields' >>>>>>> >>>>>>> and you'll see that libraries/tbl_replace_fields.inc.php is
using
>>> these >>>>>>> variables (other scripts are also using them). >>>>>>> >>>>>>> I just realize that Marc. Sorry for the mistake. >>>>>> And is it ok to changing variable name like above. >>>>> >>>>> Yes, this is good refactoring. Of course, you know I'm allergic
to
> using >>>>> the term "field" when it refers to a table's column. >>>> >>>> >>>> Ok Marc. :) >>> >>> By the way, I prefer that you finish your work on tbl_change
before
>>> working on tbl_replace. >>> >>> I wish to merge your work soon, but there are still things to
improve
or
>>> fix: >>> >>> - the multi-row edit bug >>> - the $vrow and $vresult variables >> >> >> Hi Marc, >> I'm trying to fix the multi-row edit bug. But still I couldn't find
the
>> place which is wrong that I have done when refactoring. > > You can find which commit produced the bug, with git bisect. The
current
> upstream master does not have this bug.
Hi Marc, I fixed the issue. But when I commit, I used the following scenario,
- git status -> two modified files
- git add [2 files]
- git commit -m " " ->(2 file changed, ......)
- git push origin master -> it says everything up-to-date :(
Am I missed something ?
Maybe you're missing 'git checkout master' before committing? If 'git branch' says that you're on another branch, you can push like this 'git push origin anotherbranch:master'
Bye, Rouslan
Hi Rouslan,
$ git branch
- (no branch) master
This means that you are currently not on any branch.
So how to push my changes. (Now I'm in the master, I ran 'git checkout master' )
Now that you are in your master branch, what's the output of
git status
As I mentioned in previous email earlier I ran 'git commit' and then push.
But it said everything up-to-date. After I ran git status. Then no any modified files. (Now I have done some changes in insert_edit.lib.php and tbl_replace.php files)